From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] Core Update 179: Only start services if they are enabled Date: Thu, 24 Aug 2023 11:33:12 +0100 Message-ID: <0F210B6B-E2F1-4642-844D-D2107A3A4C5A@ipfire.org> In-Reply-To: <80612c05-cb2e-46f8-a1d4-afe135568efc@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5893495916124913668==" List-Id: --===============5893495916124913668== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello, > On 23 Aug 2023, at 15:43, Peter M=C3=BCller wr= ote: >=20 > Doing so avoids situations where a service is started without being > configured to do so, thus reducing the potential for confusion and > exposure of services not intended to be exposed by the user. >=20 > Signed-off-by: Peter M=C3=BCller > --- > config/rootfiles/core/179/update.sh | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) >=20 > diff --git a/config/rootfiles/core/179/update.sh b/config/rootfiles/core/17= 9/update.sh > index 636792d82..df89d702e 100644 > --- a/config/rootfiles/core/179/update.sh > +++ b/config/rootfiles/core/179/update.sh > @@ -86,9 +86,13 @@ migrate_extrahd >=20 > # Start services > /etc/init.d/udev restart > -/etc/init.d/squid restart > -/usr/local/bin/openvpnctrl -s > -/usr/local/bin/openvpnctrl -sn2n > +if [ -f /var/ipfire/proxy/enable ]; then > + /etc/init.d/squid restart > +fi > +if grep -q "ENABLED=3Don" /var/ipfire/ovpn/settings; then > + /usr/local/bin/openvpnctrl -s > + /usr/local/bin/openvpnctrl -sn2n > +fi This is slightly incorrect, because you are checking if the RW service is run= ning. That is not required to use a N2N connection. I merged this patch and moved the -sn2n command back. Best, -Michael >=20 > # This update needs a reboot... > touch /var/run/need_reboot > --=20 > 2.35.3 >=20 --===============5893495916124913668==--