From 4335a5948f06fc70e77ffe947b6aabb538e4980a Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 4 Apr 2010 11:40:00 +0200 Subject: [PATCH] Started core38 updater. --- config/rootfiles/core/38/exclude | 0 config/rootfiles/core/38/filelists/collectd | 1 + config/rootfiles/core/38/filelists/dosfstools | 1 + config/rootfiles/core/38/filelists/e2fsprogs | 1 + config/rootfiles/core/38/filelists/files | 21 +++ config/rootfiles/core/38/filelists/fuse | 1 + config/rootfiles/core/38/filelists/grub | 1 + config/rootfiles/core/38/filelists/iptables | 1 + config/rootfiles/core/38/filelists/liboping | 1 + config/rootfiles/core/38/filelists/linux | 1 + .../core/38/filelists/linux-firmware | 1 + config/rootfiles/core/38/filelists/openssh | 1 + config/rootfiles/core/38/filelists/openssl | 1 + config/rootfiles/core/38/filelists/rrdtool | 1 + config/rootfiles/core/38/filelists/strongswan | 1 + config/rootfiles/core/38/filelists/sysklogd | 1 + config/rootfiles/core/38/filelists/xz | 1 + config/rootfiles/core/38/meta | 1 + config/rootfiles/core/38/update.sh | 143 ++++++++++++++++++ 19 files changed, 180 insertions(+) create mode 100644 config/rootfiles/core/38/exclude create mode 120000 config/rootfiles/core/38/filelists/collectd create mode 120000 config/rootfiles/core/38/filelists/dosfstools create mode 120000 config/rootfiles/core/38/filelists/e2fsprogs create mode 100644 config/rootfiles/core/38/filelists/files create mode 120000 config/rootfiles/core/38/filelists/fuse create mode 120000 config/rootfiles/core/38/filelists/grub create mode 120000 config/rootfiles/core/38/filelists/iptables create mode 120000 config/rootfiles/core/38/filelists/liboping create mode 120000 config/rootfiles/core/38/filelists/linux create mode 120000 config/rootfiles/core/38/filelists/linux-firmware create mode 120000 config/rootfiles/core/38/filelists/openssh create mode 120000 config/rootfiles/core/38/filelists/openssl create mode 120000 config/rootfiles/core/38/filelists/rrdtool create mode 120000 config/rootfiles/core/38/filelists/strongswan create mode 120000 config/rootfiles/core/38/filelists/sysklogd create mode 120000 config/rootfiles/core/38/filelists/xz create mode 100644 config/rootfiles/core/38/meta create mode 100644 config/rootfiles/core/38/update.sh diff --git a/config/rootfiles/core/38/exclude b/config/rootfiles/core/38/exclude new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/rootfiles/core/38/filelists/collectd b/config/rootfiles/core/38/filelists/collectd new file mode 120000 index 0000000000..871b32f14b --- /dev/null +++ b/config/rootfiles/core/38/filelists/collectd @@ -0,0 +1 @@ +../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/dosfstools b/config/rootfiles/core/38/filelists/dosfstools new file mode 120000 index 0000000000..087ccb0dea --- /dev/null +++ b/config/rootfiles/core/38/filelists/dosfstools @@ -0,0 +1 @@ +../../../common/dosfstools \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/e2fsprogs b/config/rootfiles/core/38/filelists/e2fsprogs new file mode 120000 index 0000000000..37b55de698 --- /dev/null +++ b/config/rootfiles/core/38/filelists/e2fsprogs @@ -0,0 +1 @@ +../../../common/e2fsprogs \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/files b/config/rootfiles/core/38/filelists/files new file mode 100644 index 0000000000..a830c95074 --- /dev/null +++ b/config/rootfiles/core/38/filelists/files @@ -0,0 +1,21 @@ +etc/system-release +var/ipfire/backup/bin/backup.pl +var/ipfire/header.pl +etc/modprobe.d/cfg80211 +var/ipfire/qos/bin/makeqosscripts.pl +srv/web/ipfire/cgi-bin/connections.cgi +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/iptables.cgi +srv/web/ipfire/cgi-bin/logs.cgi/config.dat +srv/web/ipfire/cgi-bin/netother.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +var/ipfire/langs/de.pl +var/ipfire/langs/en.pl +var/ipfire/langs/fr.pl +etc/rc.d/init.d/firewall +etc/rc.d/init.d/ipsec +usr/local/bin/ipsecctrl +usr/local/bin/syslogdctrl +usr/local/bin/wirelessctrl +opt/pakfire/lib/functions.sh + diff --git a/config/rootfiles/core/38/filelists/fuse b/config/rootfiles/core/38/filelists/fuse new file mode 120000 index 0000000000..570edaadef --- /dev/null +++ b/config/rootfiles/core/38/filelists/fuse @@ -0,0 +1 @@ +../../../common/fuse \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/grub b/config/rootfiles/core/38/filelists/grub new file mode 120000 index 0000000000..050745c10d --- /dev/null +++ b/config/rootfiles/core/38/filelists/grub @@ -0,0 +1 @@ +../../../common/grub \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/iptables b/config/rootfiles/core/38/filelists/iptables new file mode 120000 index 0000000000..8caf12bccb --- /dev/null +++ b/config/rootfiles/core/38/filelists/iptables @@ -0,0 +1 @@ +../../../common/iptables \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/liboping b/config/rootfiles/core/38/filelists/liboping new file mode 120000 index 0000000000..3ae1904e70 --- /dev/null +++ b/config/rootfiles/core/38/filelists/liboping @@ -0,0 +1 @@ +../../../common/liboping \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/linux b/config/rootfiles/core/38/filelists/linux new file mode 120000 index 0000000000..c469fe1886 --- /dev/null +++ b/config/rootfiles/core/38/filelists/linux @@ -0,0 +1 @@ +../../../common/linux \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/linux-firmware b/config/rootfiles/core/38/filelists/linux-firmware new file mode 120000 index 0000000000..4bf91bca9f --- /dev/null +++ b/config/rootfiles/core/38/filelists/linux-firmware @@ -0,0 +1 @@ +../../../common/linux-firmware \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/openssh b/config/rootfiles/core/38/filelists/openssh new file mode 120000 index 0000000000..d8c77fd8e7 --- /dev/null +++ b/config/rootfiles/core/38/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/openssl b/config/rootfiles/core/38/filelists/openssl new file mode 120000 index 0000000000..e011a9266c --- /dev/null +++ b/config/rootfiles/core/38/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/rrdtool b/config/rootfiles/core/38/filelists/rrdtool new file mode 120000 index 0000000000..7a82e414b6 --- /dev/null +++ b/config/rootfiles/core/38/filelists/rrdtool @@ -0,0 +1 @@ +../../../common/rrdtool \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/strongswan b/config/rootfiles/core/38/filelists/strongswan new file mode 120000 index 0000000000..90c727e265 --- /dev/null +++ b/config/rootfiles/core/38/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/sysklogd b/config/rootfiles/core/38/filelists/sysklogd new file mode 120000 index 0000000000..e166ef2258 --- /dev/null +++ b/config/rootfiles/core/38/filelists/sysklogd @@ -0,0 +1 @@ +../../../common/sysklogd \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/xz b/config/rootfiles/core/38/filelists/xz new file mode 120000 index 0000000000..734e926c7e --- /dev/null +++ b/config/rootfiles/core/38/filelists/xz @@ -0,0 +1 @@ +../../../common/xz \ No newline at end of file diff --git a/config/rootfiles/core/38/meta b/config/rootfiles/core/38/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/core/38/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/38/update.sh b/config/rootfiles/core/38/update.sh new file mode 100644 index 0000000000..a8ce42f250 --- /dev/null +++ b/config/rootfiles/core/38/update.sh @@ -0,0 +1,143 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2010 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 +# +KVER="2.6.32.10" +ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1` +MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` +# Nur den letzten Parameter verwenden +echo $MOUNT > /dev/null +MOUNT=$_ +if [ ! $MOUNT == "rw" ]; then + MOUNT="ro" +fi +# +# check if we the backup file already exist +if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 ]; then + echo Moving backup to backup-old ... + mv -f /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \ + /var/ipfire/backup/core-upgrade_$KVER-old.tar.bz2 +fi +echo First we made a backup of all files that was inside of the +echo update archive. This may take a while ... +# Add some files that are not in the package to backup +echo lib/modules >> /opt/pakfire/tmp/ROOTFILES +echo boot >> /opt/pakfire/tmp/ROOTFILES +echo etc/sysconfig/lm_sensors >> /opt/pakfire/tmp/ROOTFILES +# +# Todo: add openswan libs for backup ... +# +tar cjvf /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \ + -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' > /dev/null 2>&1 +echo +echo Update Kernel to $KVER ... +# Remove old kernel, configs, initrd, modules ... +# +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/vmlinuz-* +# Don't remove old xen modules. Kernel may stored outside. +rm -rf /lib/modules/*-ipfire +# +# Todo: remove openswan libs ... +# + +# +# Backup grub.conf +# +cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org +# +# Unpack the updated files +# +echo +echo Unpack the updated files ... +# +tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \ + --no-overwrite-dir +# +# Modify grub.conf +# +echo +echo Update grub configuration ... +sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf +sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf +sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf + +if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then + echo "grub use default console ..." +else + echo "grub use serial console ..." + sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf + sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf + sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf + sed -i -e "s| panic=10 | console=ttyS0,38400n8 panic=10 |g" /boot/grub/grub.conf +fi +# +# Made emergency - initramdisk +# +echo +echo Create new Initramdisks ... +cp -f /etc/mkinitcpio.conf /etc/mkinitcpio.conf.org +sed -i "s| autodetect | |g" /etc/mkinitcpio.conf +mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER-emergency.img +cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf +# +# Made initramdisk +# +if [ "${ROOT:0:7}" == "/dev/sd" ]; then + # Remove ide hook if root is on sda + sed -i "s| ide | |g" /etc/mkinitcpio.conf +else +if [ "${ROOT:0:7}" == "/dev/hd" ]; then + # Remove pata & sata hook if root is on hda + sed -i "s| pata | |g" /etc/mkinitcpio.conf + sed -i "s| sata | |g" /etc/mkinitcpio.conf +fi +fi +mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER.img +# +# ReInstall grub +# +grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck +# +# Rebuild Language +# +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +# +# Todo: rebuild qosscript if enabled... +# +# +# Todo convert ipsec.conf from open to strongswan... +# +# +# Delete old lm-sensor modullist... +# +rm -rf /etc/sysconfig/lm_sensors +# +# This core-update need a reboot +/usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Upgrade finished. If you use a customized grub.cfg" +/usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Check it before reboot !!!" +/usr/bin/logger -p syslog.emerg -t core-upgrade-38 " *** Please reboot... *** " -- 2.39.2