Merge branch 'thirteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into thirteen

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

diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
index 34f814b9aa0e1f91c6d6cb277046242de136fa10..b01290c5e671ced19f99d9672f81fead0110d32d 100644 (file)
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -1,9 +1,11 @@
 bin/bash
 bin/cat
-bin/grep
+bin/echo
 bin/pwd
 bin/stty
 #boot
+dev/console
+dev/null
 etc/bashrc
 etc/certparams
 etc/e2fsck.conf
@@ -13,8 +15,8 @@ etc/hddtemp.db
 etc/host.conf
 etc/inittab
 etc/inputrc
-#etc/ipsec.user.conf
-#etc/ipsec.user.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
 etc/issue
 etc/ld.so.conf
 etc/logrotate.conf
@@ -29,11 +31,11 @@ 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/colorls.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
@@ -49,14 +51,24 @@ media/usbkey
 mnt
 #opt
 #root
+root/.bash_logout
+root/.bash_profile
+root/.bashrc
 root/ipfire
 #sbin
 #srv
+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
@@ -73,14 +85,15 @@ usr/local/bin/scanhd
 usr/local/bin/setddns.pl
 usr/local/bin/settime
 usr/local/bin/timecheck
-#usr/local/bin/uname
-usr/local/bin/vpn-watch
 #usr/local/include
 #usr/local/lib
 #usr/local/sbin
+#usr/local/share
 #usr/local/share/doc
 #usr/local/share/info
 #usr/local/share/locale
+#usr/local/share/man
+#usr/local/share/man/man1
 #usr/local/share/man/man2
 #usr/local/share/man/man3
 #usr/local/share/man/man4
@@ -132,6 +145,3 @@ var/run
 var/run/utmp
 #var/spool
 var/tmp
-dev/null
-dev/console
-tmp