From b0ab1b098ed35da40aebc5bb3ab77839d9f17a53 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 18 Aug 2010 00:01:50 +0200 Subject: [PATCH 1/1] Start updater (test). --- config/rootfiles/core/test/exclude | 1 + config/rootfiles/core/test/filelists/dracut | 1 + config/rootfiles/core/test/filelists/files | 3 + config/rootfiles/core/test/filelists/grub | 1 + config/rootfiles/core/test/filelists/linux | 1 + .../core/test/filelists/linux-firmware | 1 + config/rootfiles/core/test/filelists/tcl | 1 + config/rootfiles/core/test/filelists/udev | 1 + .../core/test/filelists/usb_modeswitch | 1 + .../core/test/filelists/usb_modeswitch_data | 1 + config/rootfiles/core/test/meta | 1 + config/rootfiles/core/test/update.sh | 115 ++++++++++++++++++ 12 files changed, 128 insertions(+) create mode 100644 config/rootfiles/core/test/exclude create mode 120000 config/rootfiles/core/test/filelists/dracut create mode 100644 config/rootfiles/core/test/filelists/files create mode 120000 config/rootfiles/core/test/filelists/grub create mode 120000 config/rootfiles/core/test/filelists/linux create mode 120000 config/rootfiles/core/test/filelists/linux-firmware create mode 120000 config/rootfiles/core/test/filelists/tcl create mode 120000 config/rootfiles/core/test/filelists/udev create mode 120000 config/rootfiles/core/test/filelists/usb_modeswitch create mode 120000 config/rootfiles/core/test/filelists/usb_modeswitch_data create mode 100644 config/rootfiles/core/test/meta create mode 100644 config/rootfiles/core/test/update.sh diff --git a/config/rootfiles/core/test/exclude b/config/rootfiles/core/test/exclude new file mode 100644 index 0000000000..759e081672 --- /dev/null +++ b/config/rootfiles/core/test/exclude @@ -0,0 +1 @@ +etc/udev/rules.d/30-persistent-network.rules diff --git a/config/rootfiles/core/test/filelists/dracut b/config/rootfiles/core/test/filelists/dracut new file mode 120000 index 0000000000..160869946d --- /dev/null +++ b/config/rootfiles/core/test/filelists/dracut @@ -0,0 +1 @@ +../../../common/dracut \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/files b/config/rootfiles/core/test/filelists/files new file mode 100644 index 0000000000..509483d066 --- /dev/null +++ b/config/rootfiles/core/test/filelists/files @@ -0,0 +1,3 @@ +etc/system-release +etc/rc.d/init.d/checkfstab +usr/local/bin/rebuild-initrd diff --git a/config/rootfiles/core/test/filelists/grub b/config/rootfiles/core/test/filelists/grub new file mode 120000 index 0000000000..050745c10d --- /dev/null +++ b/config/rootfiles/core/test/filelists/grub @@ -0,0 +1 @@ +../../../common/grub \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/linux b/config/rootfiles/core/test/filelists/linux new file mode 120000 index 0000000000..c469fe1886 --- /dev/null +++ b/config/rootfiles/core/test/filelists/linux @@ -0,0 +1 @@ +../../../common/linux \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/linux-firmware b/config/rootfiles/core/test/filelists/linux-firmware new file mode 120000 index 0000000000..4bf91bca9f --- /dev/null +++ b/config/rootfiles/core/test/filelists/linux-firmware @@ -0,0 +1 @@ +../../../common/linux-firmware \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/tcl b/config/rootfiles/core/test/filelists/tcl new file mode 120000 index 0000000000..7f620c687e --- /dev/null +++ b/config/rootfiles/core/test/filelists/tcl @@ -0,0 +1 @@ +../../../common/tcl \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/udev b/config/rootfiles/core/test/filelists/udev new file mode 120000 index 0000000000..e967a1c925 --- /dev/null +++ b/config/rootfiles/core/test/filelists/udev @@ -0,0 +1 @@ +../../../common/udev \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/usb_modeswitch b/config/rootfiles/core/test/filelists/usb_modeswitch new file mode 120000 index 0000000000..acbab6f332 --- /dev/null +++ b/config/rootfiles/core/test/filelists/usb_modeswitch @@ -0,0 +1 @@ +../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/usb_modeswitch_data b/config/rootfiles/core/test/filelists/usb_modeswitch_data new file mode 120000 index 0000000000..4cbce46cf7 --- /dev/null +++ b/config/rootfiles/core/test/filelists/usb_modeswitch_data @@ -0,0 +1 @@ +../../../common/usb_modeswitch_data \ No newline at end of file diff --git a/config/rootfiles/core/test/meta b/config/rootfiles/core/test/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/core/test/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/test/update.sh b/config/rootfiles/core/test/update.sh new file mode 100644 index 0000000000..1a18fcef9e --- /dev/null +++ b/config/rootfiles/core/test/update.sh @@ -0,0 +1,115 @@ +#!/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.19" +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/mkinitcpio.conf >> /opt/pakfire/tmp/ROOTFILES +echo etc/mkinitcpio.conf.org >> /opt/pakfire/tmp/ROOTFILES +echo etc/mkinitcpio.d >> /opt/pakfire/tmp/ROOTFILES +echo lib/initcpio >> /opt/pakfire/tmp/ROOTFILES +echo sbin/mkinitcpio >> /opt/pakfire/tmp/ROOTFILES + +# Backup the files +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-* +rm -rf /lib/modules/*-ipfire +# Remove mkinitcpio +rm -rf /etc/mkinitcpio.* +rm -rf /lib/initcpio +rm -rf /sbin/mkinitcpio +# +# 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 +# +# ReInstall grub +# +grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck +# +# Rebuild Language +# +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +# +# Delete old lm-sensor modullist to force search at next boot +# +rm -rf /etc/sysconfig/lm_sensors +/usr/bin/logger -p syslog.emerg -t kernel "Upgrade finished. If you use a customized grub.cfg" +/usr/bin/logger -p syslog.emerg -t kernel "Check it before reboot !!!" +/usr/bin/logger -p syslog.emerg -t kernel " *** Please reboot... *** " -- 2.39.2