configroot: fix merge problem.

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

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index e14f7e0e23b2ea68bd3ef9e7d35c8d49f63fb793..8cd4a8a374d611ab4e46a71f14b16ebe5588c099 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -1,3 +1,8 @@
+usr/sbin/convert-dmz
+usr/sbin/convert-outgoingfw
+usr/sbin/convert-portfw
+usr/sbin/convert-xtaccess
+usr/sbin/firewall-policy
 #var/ipfire
 var/ipfire/addon-lang
 var/ipfire/auth
@@ -26,16 +31,17 @@ var/ipfire/dhcp
 #var/ipfire/dhcp/fixleases
 #var/ipfire/dhcp/settings
 var/ipfire/dhcpc
-var/ipfire/dmzholes
-#var/ipfire/dmzholes/config
 var/ipfire/dns
 #var/ipfire/dns/settings
+var/ipfire/dnsforward
+#var/ipfire/dnsforward/config
 var/ipfire/ethernet
 #var/ipfire/ethernet/aliases
 #var/ipfire/ethernet/known_nics
 #var/ipfire/ethernet/scanned_nics
 #var/ipfire/ethernet/settings
 #var/ipfire/ethernet/vlans
+#var/ipfire/ethernet/wireless
 #var/ipfire/extrahd
 #var/ipfire/extrahd/bin
 var/ipfire/extrahd/bin/extrahd.pl
@@ -43,6 +49,24 @@ var/ipfire/extrahd/devices
 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/fwhosts
+var/ipfire/fwhosts/customgroups
+var/ipfire/fwhosts/customhosts
+var/ipfire/fwhosts/customnetworks
+var/ipfire/fwhosts/customservicegrp
+var/ipfire/fwhosts/customservices
+var/ipfire/fwhosts/icmp-types
 var/ipfire/fwlogs
 #var/ipfire/fwlogs/ipsettings
 #var/ipfire/fwlogs/portsettings
@@ -59,8 +83,10 @@ var/ipfire/langs
 #var/ipfire/langs/es.pl
 #var/ipfire/langs/fr.pl
 #var/ipfire/langs/list
+#var/ipfire/langs/nl.pl
 #var/ipfire/langs/pl.pl
 #var/ipfire/langs/ru.pl
+#var/ipfire/langs/tr.pl
 var/ipfire/logging
 #var/ipfire/logging/settings
 var/ipfire/mac
@@ -86,6 +112,7 @@ var/ipfire/menu.d/70-log.menu
 #var/ipfire/menu.d/EX-imspector.menu
 #var/ipfire/menu.d/EX-mpfire.menu
 #var/ipfire/menu.d/EX-samba.menu
+#var/ipfire/menu.d/EX-tor.menu
 #var/ipfire/menu.d/EX-tripwire.menu
 #var/ipfire/menu.d/EX-wlanap.menu
 var/ipfire/modem
@@ -99,17 +126,11 @@ var/ipfire/net-traffic
 #var/ipfire/nfs
 #var/ipfire/nfs/nfs-server
 var/ipfire/optionsfw
-#var/ipfire/optionsfw/settings
-var/ipfire/outgoing
-#var/ipfire/outgoing/bin
-#var/ipfire/outgoing/bin/outgoingfw.pl
-var/ipfire/outgoing/defaultservices
-#var/ipfire/outgoing/groups
-#var/ipfire/outgoing/groups/ipgroups
-#var/ipfire/outgoing/groups/macgroups
-#var/ipfire/outgoing/p2protocols
-#var/ipfire/outgoing/rules
-#var/ipfire/outgoing/settings
+var/ipfire/optionsfw/settings
+var/ipfire/ovpn
+var/ipfire/ovpn/ccd.conf
+var/ipfire/ovpn/ccdroute
+var/ipfire/ovpn/ccdroute2
 var/ipfire/pakfire
 #var/ipfire/pakfire/settings
 #var/ipfire/patches
@@ -178,7 +199,5 @@ var/ipfire/wakeonlan
 var/ipfire/wireless
 #var/ipfire/wireless/config
 #var/ipfire/wireless/settings
-var/ipfire/xtaccess
-#var/ipfire/xtaccess/config
 var/ipfire/firebuild
 etc/system-release