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

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

diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
index 3856d7f4bb54dcc9642c88ac08154d91350cf9f4..3d21e4e2abd2e6c615bced3fd3c7bf80f9c8eb34 100644 (file)
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -1,11 +1,11 @@
 bin/bash
 bin/cat
-bin/grep
+bin/echo
 bin/pwd
 bin/stty
 #boot
-dev/null
 dev/console
+dev/null
 etc/bashrc
 etc/certparams
 etc/e2fsck.conf
@@ -15,12 +15,15 @@ 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
@@ -51,13 +54,19 @@ mnt
 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
@@ -66,13 +75,13 @@ 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/rebuild-initrd
 usr/local/bin/setddns.pl
 usr/local/bin/settime
 usr/local/bin/timecheck
-usr/local/bin/vpn-watch
 #usr/local/include
 #usr/local/lib
 #usr/local/sbin
@@ -96,6 +105,8 @@ usr/local/bin/vpn-watch
 #usr/sbin
 #usr/share
 #usr/share/doc
+#usr/share/doc/licenses
+usr/share/doc/licenses/GPLv3
 #usr/share/info
 #usr/share/locale
 #usr/share/man
@@ -123,6 +134,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
@@ -130,6 +142,3 @@ var/run
 var/run/utmp
 #var/spool
 var/tmp
-#usr/local/bin/asterisk
-#usr/local/bin/sanedloop
-#var/log/net-traffic.log