Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x

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

diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
index 26d190598870d11947fd6bbab2260732a7ec8cc5..3856d7f4bb54dcc9642c88ac08154d91350cf9f4 100644 (file)
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -8,8 +8,10 @@ dev/null
 dev/console
 etc/bashrc
 etc/certparams
+etc/e2fsck.conf
 etc/fstab
 etc/group
+etc/hddtemp.db
 etc/host.conf
 etc/inittab
 etc/inputrc
@@ -18,6 +20,7 @@ etc/ld.so.conf
 etc/logrotate.conf
 etc/mime.types
 etc/modprobe.d
+etc/modprobe.d/cfg80211
 etc/modules.conf
 etc/mtab
 etc/nsswitch.conf
@@ -25,6 +28,7 @@ etc/nsswitch.conf
 etc/passwd
 etc/profile
 #etc/profile.d
+etc/profile.d/bashrc.sh
 etc/profile.d/dircolors.sh
 etc/profile.d/extrapaths.sh
 etc/profile.d/i18n.sh
@@ -54,21 +58,20 @@ tmp
 #usr/lib
 usr/lib/libgcc_s.so
 usr/lib/libgcc_s.so.1
+usr/local/bin/backupiso
 usr/local/bin/connscheduler
 usr/local/bin/dialctrl.pl
 usr/local/bin/hddshutdown
-usr/local/bin/hddshutdown-state
 usr/local/bin/httpscert
 usr/local/bin/makegraphs
 usr/local/bin/qosd
 usr/local/bin/readhash
 usr/local/bin/run-parts
 usr/local/bin/scanhd
+usr/local/bin/rebuild-initrd
 usr/local/bin/setddns.pl
-usr/local/bin/setreservedports
 usr/local/bin/settime
 usr/local/bin/timecheck
-usr/local/bin/tunerrd.pl
 usr/local/bin/vpn-watch
 #usr/local/include
 #usr/local/lib
@@ -127,3 +130,6 @@ var/run
 var/run/utmp
 #var/spool
 var/tmp
+#usr/local/bin/asterisk
+#usr/local/bin/sanedloop
+#var/log/net-traffic.log