Merge remote-tracking branch 'origin/next' into thirteen

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

diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
index 9ad990fee8b818f9e525aca1b9d4770d72aa1668..7cd1934bee1d42139b4ad6cb56bed76aba079f23 100644 (file)
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -1,23 +1,27 @@
 bin/bash
 bin/cat
-bin/grep
+bin/echo
 bin/pwd
 bin/stty
 #boot
-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
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
 etc/issue
 etc/ld.so.conf
 etc/logrotate.conf
 etc/mime.types
 etc/modprobe.d
+etc/modprobe.d/cfg80211
+etc/modprobe.d/pcspeaker
 etc/modules.conf
 etc/mtab
 etc/nsswitch.conf
@@ -25,10 +29,13 @@ etc/nsswitch.conf
 etc/passwd
 etc/profile
 #etc/profile.d
-etc/profile.d/dircolors.sh
+etc/profile.d/colorls.sh
 etc/profile.d/extrapaths.sh
+etc/profile.d/glib2-locale.sh
 etc/profile.d/i18n.sh
+etc/profile.d/lang.sh
 etc/profile.d/readline.sh
+etc/profile.d/term256.sh
 etc/profile.d/umask.sh
 etc/resolv.conf
 etc/securetty
@@ -44,32 +51,41 @@ media/usbkey
 mnt
 #opt
 #root
+root/.bash_logout
+root/.bash_profile
+root/.bashrc
 root/ipfire
 #sbin
 #srv
-#sys
-tmp
+#usr/bin
 #usr/bin/perl
 #usr/include
 #usr/lib
-usr/lib/libgcc_s.so
+#usr/lib/libgcc_s.so
 usr/lib/libgcc_s.so.1
+#usr/lib/libstdc++.la
+#usr/lib/libstdc++.so
+usr/lib/libstdc++.so.6
+#usr/local
+#usr/local/bin
+#usr/local/bin/archive.files
+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/rebuild-initrd
 usr/local/bin/run-parts
+#usr/local/bin/sanedloop
 usr/local/bin/scanhd
 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-restart
+#usr/local/bin/uname
+usr/local/bin/update-lang-cache
 usr/local/bin/vpn-watch
 #usr/local/include
 #usr/local/lib
@@ -92,8 +108,11 @@ usr/local/bin/vpn-watch
 #usr/local/share/zoneinfo
 #usr/local/src
 #usr/sbin
+usr/sbin/ovpn-ccd-convert
 #usr/share
 #usr/share/doc
+#usr/share/doc/licenses
+usr/share/doc/licenses/GPLv3
 #usr/share/info
 #usr/share/locale
 #usr/share/man
@@ -121,6 +140,7 @@ var/log/btmp
 var/log/calamaris
 var/log/counter
 var/log/lastlog
+#var/log/net-traffic.log
 var/log/wtmp
 var/mail
 #var/opt
@@ -128,3 +148,6 @@ var/run
 var/run/utmp
 #var/spool
 var/tmp
+dev/console
+dev/null
+tmp