Firewall: fix Update from core 75 to 76

diff --git a/config/firewall/convert-outgoingfw b/config/firewall/convert-outgoingfw
index ea493752e15e3d59192b30f932598498186dbad6..2f9b74c4f9c2a3659e661bc2f621db399b616738 100755 (executable)
--- a/config/firewall/convert-outgoingfw
+++ b/config/firewall/convert-outgoingfw
@@ -78,6 +78,11 @@ else
 
 if (! -s "$outfwsettings") {
         print "Empty DMZ configuration file. Nothing to do. Exiting...\n";
+        #Fill the firewall settings file
+       open (SETTINGS, ">/var/ipfire/firewall/settings");
+       print SETTINGS "POLICY=MODE2\n";
+       print SETTINGS "POLICY1=MODE2\n";
+       close (SETTINGS);
         exit(0);
 }
 

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index f50937016da4a4efa2003224c9fda32cfd744dd4..b5de9891de9e0656abac8c5b47055d35f5325a47 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -63,6 +63,7 @@ var/ipfire/fwhosts
 #var/ipfire/fwhosts/customnetworks
 #var/ipfire/fwhosts/customservicegrp
 #var/ipfire/fwhosts/customservices
+#var/ipfire/fwhosts/customservices.default
 #var/ipfire/fwhosts/icmp-types
 var/ipfire/fwlogs
 #var/ipfire/fwlogs/ipsettings

diff --git a/config/rootfiles/core/76/filelists/firewall b/config/rootfiles/core/76/filelists/firewall
index e770307c14b1f0b57373e2661a639933a4a03c74..6eeaeaed5cc74cdb4e8aa75bd5660aa5223c778d 100644 (file)
--- a/config/rootfiles/core/76/filelists/firewall
+++ b/config/rootfiles/core/76/filelists/firewall
@@ -11,3 +11,4 @@ usr/sbin/firewall-policy
 var/ipfire/firewall/p2protocols
 var/ipfire/fwhosts/icmp-types
 var/ipfire/menu.d/50-firewall.menu
+var/ipfire/fwhosts/customservices.default

diff --git a/config/rootfiles/core/76/update.sh b/config/rootfiles/core/76/update.sh
index a9055d320f213c09f43bc074e9e3de159a691c09..0561f39563e0678c32f17a0b4ac3fe6c8bdfb34b 100644 (file)
--- a/config/rootfiles/core/76/update.sh
+++ b/config/rootfiles/core/76/update.sh
@@ -291,6 +291,10 @@ touch /var/ipfire/fwhosts/customgroups
 touch /var/ipfire/fwhosts/customservices
 touch /var/ipfire/fwhosts/customservicegrp
 
+if [ ! -s "/var/ipfire/fwhosts/customservices" ];then
+       cp /var/ipfire/fwhosts/customservices.default /var/ipfire/fwhosts/customservices
+fi
+
 # Fix ownership.
 chown -R nobody:nobody /var/ipfire/firewall
 chown -R nobody:nobody /var/ipfire/fwhosts

diff --git a/lfs/configroot b/lfs/configroot
index 8250a77f68669784850c1675c21e089e52c73c88..3232d38ecbd7452974dd33838080fed23ad47ef9 100644 (file)
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -107,6 +107,7 @@ $(TARGET) :
        cp $(DIR_SRC)/config/firewall/firewall-policy   /usr/sbin/firewall-policy
        cp $(DIR_SRC)/config/fwhosts/icmp-types                 $(CONFIG_ROOT)/fwhosts/icmp-types
        cp $(DIR_SRC)/config/fwhosts/customservices             $(CONFIG_ROOT)/fwhosts/customservices
+       cp $(DIR_SRC)/config/fwhosts/customservices             $(CONFIG_ROOT)/fwhosts/customservices.default
        # Oneliner configfiles
        echo  "ENABLED=off"             > $(CONFIG_ROOT)/vpn/settings
        echo  "VPN_DELAYED_START=0"     >>$(CONFIG_ROOT)/vpn/settings