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 3d21e4e2abd2e6c615bced3fd3c7bf80f9c8eb34..7cd1934bee1d42139b4ad6cb56bed76aba079f23 100644 (file)
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -4,8 +4,6 @@ bin/echo
 bin/pwd
 bin/stty
 #boot
-dev/console
-dev/null
 etc/bashrc
 etc/certparams
 etc/e2fsck.conf
@@ -31,11 +29,13 @@ etc/nsswitch.conf
 etc/passwd
 etc/profile
 #etc/profile.d
-etc/profile.d/bashrc.sh
-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
@@ -51,10 +51,12 @@ 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
@@ -82,6 +84,9 @@ usr/local/bin/scanhd
 usr/local/bin/setddns.pl
 usr/local/bin/settime
 usr/local/bin/timecheck
+#usr/local/bin/uname
+usr/local/bin/update-lang-cache
+usr/local/bin/vpn-watch
 #usr/local/include
 #usr/local/lib
 #usr/local/sbin
@@ -103,6 +108,7 @@ usr/local/bin/timecheck
 #usr/local/share/zoneinfo
 #usr/local/src
 #usr/sbin
+usr/sbin/ovpn-ccd-convert
 #usr/share
 #usr/share/doc
 #usr/share/doc/licenses
@@ -142,3 +148,6 @@ var/run
 var/run/utmp
 #var/spool
 var/tmp
+dev/console
+dev/null
+tmp