From ac7bf1466ea00aa37bd46051adae4fcb9606ddd2 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 4 Dec 2011 14:23:54 +0100 Subject: [PATCH] core54: add changed files to updater. --- config/rootfiles/core/54/filelists/daq | 1 + config/rootfiles/core/54/filelists/dracut | 1 + config/rootfiles/core/54/filelists/files | 15 +++++++++++ config/rootfiles/core/54/filelists/fireinfo | 1 + .../core/54/filelists/intelnet-modules | 9 +++++++ .../rootfiles/core/54/filelists/smartmontools | 1 + config/rootfiles/core/54/filelists/snort | 1 + config/rootfiles/core/54/filelists/squid | 1 + config/rootfiles/core/54/filelists/strongswan | 1 + config/rootfiles/core/54/filelists/tzdata | 1 + config/rootfiles/core/54/update.sh | 25 ++++++++++++++++--- 11 files changed, 54 insertions(+), 3 deletions(-) create mode 120000 config/rootfiles/core/54/filelists/daq create mode 120000 config/rootfiles/core/54/filelists/dracut create mode 120000 config/rootfiles/core/54/filelists/fireinfo create mode 100644 config/rootfiles/core/54/filelists/intelnet-modules create mode 120000 config/rootfiles/core/54/filelists/smartmontools create mode 120000 config/rootfiles/core/54/filelists/snort create mode 120000 config/rootfiles/core/54/filelists/squid create mode 120000 config/rootfiles/core/54/filelists/strongswan create mode 120000 config/rootfiles/core/54/filelists/tzdata diff --git a/config/rootfiles/core/54/filelists/daq b/config/rootfiles/core/54/filelists/daq new file mode 120000 index 000000000..d0e0956f2 --- /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 index 000000000..160869946 --- /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 409e5fe8a..318c8cb76 100644 --- 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 index 000000000..c46115521 --- /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 index 000000000..5e3439d8a --- /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 index 000000000..fb66dafef --- /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 index 000000000..9406ce01c --- /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 index 000000000..2dc8372a0 --- /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 index 000000000..90c727e26 --- /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 index 000000000..5a6e3252f --- /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 38e157e41..b4f854cdb 100644 --- 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 -- 2.39.2