Merge branch 'master' into fifteen

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

diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
index 7fa4a436b156a0ec20bfa71b884441c4bdd5bb37..114592a8e4d0d201a6202bc7231cfa15e8b40f30 100644 (file)
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -20,8 +20,8 @@ etc/ld.so.conf
 etc/logrotate.conf
 etc/mime.types
 etc/modprobe.d
-etc/modprobe.d/cfg80211
-etc/modprobe.d/pcspeaker
+etc/modprobe.d/cfg80211.conf
+etc/modprobe.d/pcspeaker.conf
 etc/modules.conf
 etc/mtab
 etc/nsswitch.conf
@@ -41,6 +41,7 @@ etc/resolv.conf
 etc/securetty
 etc/sysctl.conf
 etc/syslog.conf
+etc/system-release
 #home
 home/nobody
 #lib
@@ -50,6 +51,10 @@ 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
@@ -71,6 +76,8 @@ usr/lib/libstdc++.so.6
 #usr/local/bin/archive.files
 usr/local/bin/backupiso
 usr/local/bin/connscheduler
+usr/local/bin/consort.sh
+usr/local/bin/convert-ovpn
 usr/local/bin/dialctrl.pl
 usr/local/bin/hddshutdown
 usr/local/bin/httpscert
@@ -84,6 +91,8 @@ 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/include
 #usr/local/lib
 #usr/local/sbin
@@ -105,6 +114,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
@@ -123,6 +133,7 @@ usr/share/doc/licenses/GPLv3
 #usr/share/misc
 #usr/share/terminfo
 #usr/share/zoneinfo
+run
 #var
 #var/cache
 var/empty