updater: fix ipsec start if it is disabled.

diff --git a/config/rootfiles/core/44/update.sh b/config/rootfiles/core/44/update.sh
index 47773fbc5587a98bf049e88e7bd42d68ae7f1574..10964407b7a9bafc12ab4ae58ddf85baa78cd567 100644 (file)
--- 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 dca8f44a2f0aeabeae87e81542e3ef81a48ea339..bbf9d303f35ee9127a5080686861d9d6c4170fd8 100644 (file)
--- 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',