From bf22df04a519654ab96d3fcf4f6efddc953736cc Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 30 Dec 2010 10:46:57 +0100 Subject: [PATCH 1/1] updater: fix ipsec start if it is disabled. --- config/rootfiles/core/44/update.sh | 5 +++-- langs/de/cgi-bin/de.pl | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/core/44/update.sh b/config/rootfiles/core/44/update.sh index 47773fbc55..10964407b7 100644 --- a/config/rootfiles/core/44/update.sh +++ b/config/rootfiles/core/44/update.sh @@ -200,8 +200,9 @@ done < /var/ipfire/extrahd/devices.org # /etc/init.d/squid start /etc/init.d/snort start -/etc/init.d/ipsec start - +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi # Add pakfire and fireinfo cronjobs... grep -v "# fireinfo" /var/spool/cron/root.orig | diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index dca8f44a2f..bbf9d303f3 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -846,7 +846,7 @@ 'global settings' => 'Globale Einstellungen', 'gpl i accept these terms and conditions' => 'Ich akzeptiere diese Bedingungen und Konditionen', 'gpl license agreement' => 'Lizenz Vereinbarung', -'gpl please read carefully the general public license and accept it below' => 'Bitte die General Public License genau lesen und diese unten akzeptiere', +'gpl please read carefully the general public license and accept it below' => 'Bitte die General Public License genau lesen und diese unten akzeptieren.', 'gpl unofficial translation of the general public license v3' => 'Inoffizielle Übersetzung der General Public License v3', 'graph' => 'Diagramm', 'graph per' => 'pro', -- 2.39.2