Merge branch 'switch-to-libloc' into next-switch-to-libloc

[people/pmueller/ipfire-2.x.git] / config / rootfiles / common / stage2

diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
index 9a4d8ed975c4feafe1dfa0e2dd2a409ad8b2bf96..a5967060be993e977f2da78676075d8615276455 100644 (file)
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -20,12 +20,15 @@ etc/ld.so.conf
 etc/logrotate.conf
 etc/mime.types
 etc/modprobe.d
+etc/modprobe.d/btmrvl_sdio.conf
 etc/modprobe.d/cfg80211.conf
+etc/modprobe.d/nf_conntrack.conf
 etc/modprobe.d/pcspeaker.conf
 etc/modules.conf
 etc/mtab
 etc/nsswitch.conf
 #etc/opt
+etc/os-release
 etc/passwd
 etc/profile
 #etc/profile.d
@@ -40,11 +43,15 @@ etc/profile.d/umask.sh
 etc/resolv.conf
 etc/securetty
 etc/sysctl.conf
+#etc/sysctl-x86_64.conf
 etc/syslog.conf
 etc/system-release
 #home
 home/nobody
 #lib
+#lib/firmware
+#lib/firmware/brcm
+lib/firmware/brcm/brcmfmac43362-sdio.txt
 #media
 media/cdrom
 media/floppy
@@ -60,14 +67,17 @@ root/.bash_logout
 root/.bash_profile
 root/.bashrc
 root/ipfire
+run
 #sbin
 #srv
 #usr/bin
+usr/bin/captive-cleanup
 #usr/bin/perl
 #usr/include
 #usr/lib
 usr/lib/firewall
 usr/lib/firewall/firewall-lib.pl
+usr/lib/firewall/ipsec-policy
 usr/lib/firewall/rules.pl
 #usr/lib/libgcc_s.so
 usr/lib/libgcc_s.so.1
@@ -81,22 +91,23 @@ usr/lib/libstdc++.so.6
 usr/local/bin/backupiso
 usr/local/bin/connscheduler
 usr/local/bin/consort.sh
+usr/local/bin/convert-dns-settings
 usr/local/bin/convert-ovpn
+usr/local/bin/filesystem-cleanup
 usr/local/bin/hddshutdown
-usr/local/bin/httpscert
+usr/local/bin/ipsec-interfaces
 usr/local/bin/makegraphs
 usr/local/bin/qosd
 usr/local/bin/readhash
 usr/local/bin/rebuild-initrd
 usr/local/bin/run-parts
-#usr/local/bin/sanedloop
 usr/local/bin/scanhd
 usr/local/bin/settime
 usr/local/bin/timecheck
 usr/local/bin/timezone-transition
-#usr/local/bin/uname
-usr/local/bin/update-bootloader
 usr/local/bin/update-lang-cache
+usr/local/bin/update-ids-ruleset
+usr/local/bin/update-location-database
 #usr/local/include
 #usr/local/lib
 #usr/local/lib/sse2
@@ -116,10 +127,13 @@ usr/local/bin/update-lang-cache
 #usr/local/share/man/man8
 #usr/local/share/misc
 #usr/local/share/terminfo
+#usr/local/share/xt_geoip
 #usr/local/share/zoneinfo
 #usr/local/src
 #usr/sbin
+usr/sbin/openvpn-metrics
 usr/sbin/ovpn-ccd-convert
+usr/sbin/ovpn-collectd-convert
 #usr/share
 #usr/share/doc
 #usr/share/doc/licenses
@@ -137,8 +151,8 @@ usr/share/doc/licenses/GPLv3
 #usr/share/man/man8
 #usr/share/misc
 #usr/share/terminfo
+#usr/share/xt_geoip
 #usr/share/zoneinfo
-run
 #var
 #var/cache
 var/empty
@@ -152,7 +166,6 @@ var/log/btmp
 var/log/calamaris
 var/log/counter
 var/log/lastlog
-#var/log/net-traffic.log
 var/log/wtmp
 var/mail
 #var/opt