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

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

diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
index 001755520a90e40def1100e0cbcf3a0e25b0c449..4e8b750c8b645c9617087593e541687e4014ca4f 100644 (file)
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -1,6 +1,6 @@
 bin/bash
 bin/cat
-bin/grep
+bin/echo
 bin/pwd
 bin/stty
 #boot
@@ -13,16 +13,16 @@ 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/localtime
 etc/logrotate.conf
 etc/mime.types
 etc/modprobe.d
-etc/modprobe.d/cfg80211
-etc/modprobe.d/pcspeaker
+etc/modprobe.d/btmrvl_sdio.conf
+etc/modprobe.d/cfg80211.conf
+etc/modprobe.d/pcspeaker.conf
 etc/modules.conf
 etc/mtab
 etc/nsswitch.conf
@@ -30,38 +30,65 @@ 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
 etc/sysctl.conf
 etc/syslog.conf
+etc/system-release
 #home
 home/nobody
 #lib
+#lib/firmware
+#lib/firmware/brcm
+lib/firmware/brcm/brcmfmac4329-sdio.txt
+lib/firmware/brcm/brcmfmac4330-sdio.txt
+lib/firmware/brcm/brcmfmac43362-sdio.txt
 #media
 media/cdrom
 media/floppy
 media/usbkey
 mnt
 #opt
+#opt/pakfire
+#opt/pakfire/db
+#opt/pakfire/db/core
+opt/pakfire/db/core/mine
 #root
+root/.bash_logout
+root/.bash_profile
+root/.bashrc
 root/ipfire
+run
 #sbin
 #srv
+#usr/bin
 #usr/bin/perl
 #usr/include
 #usr/lib
-usr/lib/libgcc_s.so
+usr/lib/firewall
+usr/lib/firewall/firewall-lib.pl
+usr/lib/firewall/rules.pl
+#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/lib/sse2
+#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/consort.sh
+usr/local/bin/convert-ovpn
 usr/local/bin/hddshutdown
 usr/local/bin/httpscert
 usr/local/bin/makegraphs
@@ -71,18 +98,21 @@ 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/settime
 usr/local/bin/timecheck
-#usr/local/bin/uname
+usr/local/bin/timezone-transition
+usr/local/bin/update-bootloader
 usr/local/bin/update-lang-cache
-usr/local/bin/vpn-watch
 #usr/local/include
 #usr/local/lib
+#usr/local/lib/sse2
 #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
@@ -95,6 +125,7 @@ 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
@@ -112,6 +143,7 @@ usr/share/doc/licenses/GPLv3
 #usr/share/man/man8
 #usr/share/misc
 #usr/share/terminfo
+#usr/share/xt_geoip
 #usr/share/zoneinfo
 #var
 #var/cache
@@ -131,9 +163,8 @@ var/log/wtmp
 var/mail
 #var/opt
 var/run
-var/run/utmp
 #var/spool
 var/tmp
-dev/null
 dev/console
+dev/null
 tmp