Merge branch 'next' into fifteen

[people/teissler/ipfire-2.x.git] / config / rootfiles / common / configroot

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 0e2cbb67b04ac3eec6686940117c4e5251ea197b..7fdc983ea2febf203ab7bf384224473a722f5a0d 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -49,17 +49,17 @@ var/ipfire/extrahd
 #var/ipfire/extrahd/partitions
 #var/ipfire/extrahd/scan
 #var/ipfire/extrahd/settings
-var/ipfire/forward
-#var/ipfire/forward/bin
-#var/ipfire/forward/bin/firewall-lib.pl
-#var/ipfire/forward/bin/rules.pl
-#var/ipfire/forward/config
-#var/ipfire/forward/dmz
-#var/ipfire/forward/input
-#var/ipfire/forward/nat
-#var/ipfire/forward/outgoing
-#var/ipfire/forward/p2protocols
-#var/ipfire/forward/settings
+var/ipfire/firewall
+#var/ipfire/firewall/bin
+#var/ipfire/firewall/bin/firewall-lib.pl
+#var/ipfire/firewall/bin/rules.pl
+#var/ipfire/firewall/config
+#var/ipfire/firewall/dmz
+#var/ipfire/firewall/input
+#var/ipfire/firewall/nat
+#var/ipfire/firewall/outgoing
+#var/ipfire/firewall/p2protocols
+#var/ipfire/firewall/settings
 var/ipfire/fwhosts
 #var/ipfire/fwhosts/customgroups
 #var/ipfire/fwhosts/customhosts
@@ -199,5 +199,3 @@ var/ipfire/wakeonlan
 var/ipfire/wireless
 #var/ipfire/wireless/config
 #var/ipfire/wireless/settings
-var/ipfire/firebuild
-etc/system-release