core54: add changed files to updater.

diff --git a/config/rootfiles/core/54/filelists/daq b/config/rootfiles/core/54/filelists/daq
new file mode 120000 (symlink)
index 0000000..d0e0956
--- /dev/null
+++ b/config/rootfiles/core/54/filelists/daq
@@ -0,0 +1 @@
+../../../common/daq
\ No newline at end of file

diff --git a/config/rootfiles/core/54/filelists/dracut b/config/rootfiles/core/54/filelists/dracut
new file mode 120000 (symlink)
index 0000000..1608699
--- /dev/null
+++ b/config/rootfiles/core/54/filelists/dracut
@@ -0,0 +1 @@
+../../../common/dracut
\ No newline at end of file

diff --git a/config/rootfiles/core/54/filelists/files b/config/rootfiles/core/54/filelists/files
index 409e5fe8ac4e0442392c03e5efbd9d5d44e33c72..318c8cb76d8d9d718ff2e6628a18e9924d9ce82c 100644 (file)
--- a/config/rootfiles/core/54/filelists/files
+++ b/config/rootfiles/core/54/filelists/files
@@ -1,2 +1,17 @@
 etc/system-release
 etc/issue
+var/ipfire/langs
+usr/share/hwdata/pci.ids
+usr/share/hwdata/usb.ids
+etc/rc.d/init.d/network
+etc/rc.d/init.d/networking/dhcpcd.exe
+etc/rc.d/init.d/rc
+etc/rc.d/init.d/smartenabler
+etc/rc.d/init.d/snort
+usr/local/bin/hddshutdown
+usr/local/bin/makegraphs
+usr/local/bin/scanhd
+srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
+srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/media.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi

diff --git a/config/rootfiles/core/54/filelists/fireinfo b/config/rootfiles/core/54/filelists/fireinfo
new file mode 120000 (symlink)
index 0000000..c461155
--- /dev/null
+++ b/config/rootfiles/core/54/filelists/fireinfo
@@ -0,0 +1 @@
+../../../common/fireinfo
\ No newline at end of file

diff --git a/config/rootfiles/core/54/filelists/intelnet-modules b/config/rootfiles/core/54/filelists/intelnet-modules
new file mode 100644 (file)
index 0000000..5e3439d
--- /dev/null
+++ b/config/rootfiles/core/54/filelists/intelnet-modules
@@ -0,0 +1,9 @@
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/e1000/e1000.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/e1000e/e1000e.ko
+lib/modules/2.6.32.45-ipfire/kernel/drivers/net/igb/igb.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/e1000/e1000.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/e1000e/e1000e.ko
+lib/modules/2.6.32.45-ipfire-pae/kernel/drivers/net/igb/igb.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/e1000/e1000.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/e1000e/e1000e.ko
+lib/modules/2.6.32.45-ipfire-xen/kernel/drivers/net/igb/igb.ko

diff --git a/config/rootfiles/core/54/filelists/smartmontools b/config/rootfiles/core/54/filelists/smartmontools
new file mode 120000 (symlink)
index 0000000..fb66daf
--- /dev/null
+++ b/config/rootfiles/core/54/filelists/smartmontools
@@ -0,0 +1 @@
+../../../common/smartmontools
\ No newline at end of file

diff --git a/config/rootfiles/core/54/filelists/snort b/config/rootfiles/core/54/filelists/snort
new file mode 120000 (symlink)
index 0000000..9406ce0
--- /dev/null
+++ b/config/rootfiles/core/54/filelists/snort
@@ -0,0 +1 @@
+../../../common/snort
\ No newline at end of file

diff --git a/config/rootfiles/core/54/filelists/squid b/config/rootfiles/core/54/filelists/squid
new file mode 120000 (symlink)
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/core/54/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file

diff --git a/config/rootfiles/core/54/filelists/strongswan b/config/rootfiles/core/54/filelists/strongswan
new file mode 120000 (symlink)
index 0000000..90c727e
--- /dev/null
+++ b/config/rootfiles/core/54/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file

diff --git a/config/rootfiles/core/54/filelists/tzdata b/config/rootfiles/core/54/filelists/tzdata
new file mode 120000 (symlink)
index 0000000..5a6e325
--- /dev/null
+++ b/config/rootfiles/core/54/filelists/tzdata
@@ -0,0 +1 @@
+../../../common/tzdata
\ No newline at end of file

diff --git a/config/rootfiles/core/54/update.sh b/config/rootfiles/core/54/update.sh
index 38e157e410b49baebb931cf1a70a22e11596f570..b4f854cdb60daead2a7eef053301b68dca7882bf 100644 (file)
--- a/config/rootfiles/core/54/update.sh
+++ b/config/rootfiles/core/54/update.sh
@@ -35,6 +35,10 @@ done
 #
 #Stop services
 
+/etc/init.d/ipsec stop
+/etc/init.d/squid stop
+/etc/init.d/snort stop
+
 #
 #Extract files
 extract_files
@@ -42,15 +46,30 @@ extract_files
 #
 #Start services
 
+/etc/init.d/squid start
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+       /etc/init.d/ipsec start
+fi
 
 #
 #Update Language cache
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 
 #Rebuild module dep's
-#depmod 2.6.32.45-ipfire     >/dev/null 2>&1
-#depmod 2.6.32.45-ipfire-pae >/dev/null 2>&1
-#depmod 2.6.32.45-ipfire-xen >/dev/null 2>&1
+depmod -a 2.6.32.45-ipfire     >/dev/null 2>&1
+depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1
+depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1
+
+#Rebuild initrd's because some compat-wireless modules are inside
+/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire
+if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then
+/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae
+fi
+if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then
+/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen
+fi
+
+sync
 
 #
 #Finish