Merge remote-tracking branch 'stevee/next-suricata' into next

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

diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
index 6c9325fd17337a5be41bec6d39e0811961ffb975..5999609eded0848e052cdf63cd2e84e64aa543c3 100644 (file)
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -22,6 +22,7 @@ etc/mime.types
 etc/modprobe.d
 etc/modprobe.d/btmrvl_sdio.conf
 etc/modprobe.d/cfg80211.conf
+etc/modprobe.d/nf_conntrack.conf
 etc/modprobe.d/pcspeaker.conf
 etc/modules.conf
 etc/mtab
@@ -48,8 +49,6 @@ 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
@@ -70,11 +69,13 @@ run
 #sbin
 #srv
 #usr/bin
+usr/bin/captive-cleanup
 #usr/bin/perl
 #usr/include
 #usr/lib
 usr/lib/firewall
 usr/lib/firewall/firewall-lib.pl
+usr/lib/firewall/ipsec-policy
 usr/lib/firewall/rules.pl
 #usr/lib/libgcc_s.so
 usr/lib/libgcc_s.so.1
@@ -90,7 +91,7 @@ usr/local/bin/connscheduler
 usr/local/bin/consort.sh
 usr/local/bin/convert-ovpn
 usr/local/bin/hddshutdown
-usr/local/bin/httpscert
+usr/local/bin/ipsec-interfaces
 usr/local/bin/makegraphs
 usr/local/bin/qosd
 usr/local/bin/readhash
@@ -101,8 +102,8 @@ usr/local/bin/scanhd
 usr/local/bin/settime
 usr/local/bin/timecheck
 usr/local/bin/timezone-transition
-usr/local/bin/update-bootloader
 usr/local/bin/update-lang-cache
+usr/local/bin/update-ids-ruleset
 usr/local/bin/xt_geoip_build
 usr/local/bin/xt_geoip_update
 #usr/local/include
@@ -129,6 +130,7 @@ usr/local/bin/xt_geoip_update
 #usr/local/src
 #usr/sbin
 usr/sbin/ovpn-ccd-convert
+usr/sbin/ovpn-collectd-convert
 #usr/share
 #usr/share/doc
 #usr/share/doc/licenses
@@ -161,7 +163,6 @@ var/log/btmp
 var/log/calamaris
 var/log/counter
 var/log/lastlog
-#var/log/net-traffic.log
 var/log/wtmp
 var/mail
 #var/opt