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

2026-04-27 19:23:24 +02:00 · 2011-12-29 16:30:21 +01:00
parent 6f5ef200b3 c01c550df8
commit f530902b81
10 changed files with 196 additions and 9 deletions
--- a/config/rootfiles/core/54/filelists/GeoIP
+++ b/config/rootfiles/core/54/filelists/GeoIP
@@ -0,0 +1 @@
+usr/local/share/GeoIP/GeoIP.dat
--- a/config/rootfiles/core/54/filelists/files
+++ b/config/rootfiles/core/54/filelists/files
@@ -12,6 +12,7 @@ etc/rc.d/init.d/snort
 usr/local/bin/hddshutdown
 usr/local/bin/makegraphs
 usr/local/bin/scanhd
+srv/web/ipfire/cgi-bin/credits.cgi
 srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/media.cgi
--- a/config/rootfiles/core/54/update.sh
+++ b/config/rootfiles/core/54/update.sh
@@ -43,6 +43,10 @@ done
 # Flush old usb-modeswitch data
 rm -rf /usr/share/usb_modeswitch

+#
+# Flush old snort rules
+rm -rf /etc/snort/rules
+
 #
 #Extract files
 extract_files
--- a/config/rootfiles/installer/glibc
+++ b/config/rootfiles/installer/glibc
@@ -1 +1 @@
-../common/glibc
+../common/i586/glibc
--- a/config/rootfiles/installer/util-linux
+++ b/config/rootfiles/installer/util-linux
@@ -1 +1 @@
-../common/util-linux
+../common/i586/util-linux