From: Arne Fitzenreiter Date: Sat, 27 Nov 2010 11:08:54 +0000 (+0100) Subject: Update to 2.9 is now core43. X-Git-Tag: v2.9-beta1~48^2~5^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1db56367201e69f44d40369533a4e54338686a5;p=ipfire-2.x.git Update to 2.9 is now core43. --- diff --git a/config/rootfiles/core/43/exclude b/config/rootfiles/core/43/exclude index e69de29bb2..c2bceb8667 100644 --- a/config/rootfiles/core/43/exclude +++ b/config/rootfiles/core/43/exclude @@ -0,0 +1,6 @@ +etc/udev/rules.d/30-persistent-network.rules +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/updatecache diff --git a/config/rootfiles/core/test/filelists/apache2 b/config/rootfiles/core/43/filelists/apache2 similarity index 100% rename from config/rootfiles/core/test/filelists/apache2 rename to config/rootfiles/core/43/filelists/apache2 diff --git a/config/rootfiles/core/test/filelists/attr b/config/rootfiles/core/43/filelists/attr similarity index 100% rename from config/rootfiles/core/test/filelists/attr rename to config/rootfiles/core/43/filelists/attr diff --git a/config/rootfiles/core/test/filelists/cpio b/config/rootfiles/core/43/filelists/cpio similarity index 100% rename from config/rootfiles/core/test/filelists/cpio rename to config/rootfiles/core/43/filelists/cpio diff --git a/config/rootfiles/core/test/filelists/dnsmasq b/config/rootfiles/core/43/filelists/dnsmasq similarity index 100% rename from config/rootfiles/core/test/filelists/dnsmasq rename to config/rootfiles/core/43/filelists/dnsmasq diff --git a/config/rootfiles/core/test/filelists/dracut b/config/rootfiles/core/43/filelists/dracut similarity index 100% rename from config/rootfiles/core/test/filelists/dracut rename to config/rootfiles/core/43/filelists/dracut diff --git a/config/rootfiles/core/43/filelists/files b/config/rootfiles/core/43/filelists/files index 0037af1833..eb3c9517ec 100644 --- a/config/rootfiles/core/43/filelists/files +++ b/config/rootfiles/core/43/filelists/files @@ -1 +1,11 @@ etc/system-release +etc/rc.d/init.d/checkfs +etc/rc.d/init.d/checkfstab +etc/rc.d/init.d/squid +srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/speed.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/html/images/urlfilter/copy.gif +var/ipfire/general-functions.pl +usr/local/bin/rebuild-initrd +usr/bin/ldd diff --git a/config/rootfiles/core/test/filelists/findutils b/config/rootfiles/core/43/filelists/findutils similarity index 100% rename from config/rootfiles/core/test/filelists/findutils rename to config/rootfiles/core/43/filelists/findutils diff --git a/config/rootfiles/core/test/filelists/grub b/config/rootfiles/core/43/filelists/grub similarity index 100% rename from config/rootfiles/core/test/filelists/grub rename to config/rootfiles/core/43/filelists/grub diff --git a/config/rootfiles/core/test/filelists/iw b/config/rootfiles/core/43/filelists/iw similarity index 100% rename from config/rootfiles/core/test/filelists/iw rename to config/rootfiles/core/43/filelists/iw diff --git a/config/rootfiles/core/test/filelists/libcap b/config/rootfiles/core/43/filelists/libcap similarity index 100% rename from config/rootfiles/core/test/filelists/libcap rename to config/rootfiles/core/43/filelists/libcap diff --git a/config/rootfiles/core/test/filelists/linux b/config/rootfiles/core/43/filelists/linux similarity index 100% rename from config/rootfiles/core/test/filelists/linux rename to config/rootfiles/core/43/filelists/linux diff --git a/config/rootfiles/core/test/filelists/linux-firmware b/config/rootfiles/core/43/filelists/linux-firmware similarity index 100% rename from config/rootfiles/core/test/filelists/linux-firmware rename to config/rootfiles/core/43/filelists/linux-firmware diff --git a/config/rootfiles/core/test/filelists/smartmontools b/config/rootfiles/core/43/filelists/smartmontools similarity index 100% rename from config/rootfiles/core/test/filelists/smartmontools rename to config/rootfiles/core/43/filelists/smartmontools diff --git a/config/rootfiles/core/test/filelists/squid b/config/rootfiles/core/43/filelists/squid similarity index 100% rename from config/rootfiles/core/test/filelists/squid rename to config/rootfiles/core/43/filelists/squid diff --git a/config/rootfiles/core/test/filelists/strongswan b/config/rootfiles/core/43/filelists/strongswan similarity index 100% rename from config/rootfiles/core/test/filelists/strongswan rename to config/rootfiles/core/43/filelists/strongswan diff --git a/config/rootfiles/core/test/filelists/tcl b/config/rootfiles/core/43/filelists/tcl similarity index 100% rename from config/rootfiles/core/test/filelists/tcl rename to config/rootfiles/core/43/filelists/tcl diff --git a/config/rootfiles/core/test/filelists/udev b/config/rootfiles/core/43/filelists/udev similarity index 100% rename from config/rootfiles/core/test/filelists/udev rename to config/rootfiles/core/43/filelists/udev diff --git a/config/rootfiles/core/test/filelists/usb_modeswitch b/config/rootfiles/core/43/filelists/usb_modeswitch similarity index 100% rename from config/rootfiles/core/test/filelists/usb_modeswitch rename to config/rootfiles/core/43/filelists/usb_modeswitch diff --git a/config/rootfiles/core/test/filelists/usb_modeswitch_data b/config/rootfiles/core/43/filelists/usb_modeswitch_data similarity index 100% rename from config/rootfiles/core/test/filelists/usb_modeswitch_data rename to config/rootfiles/core/43/filelists/usb_modeswitch_data diff --git a/config/rootfiles/core/test/filelists/wireless b/config/rootfiles/core/43/filelists/wireless similarity index 100% rename from config/rootfiles/core/test/filelists/wireless rename to config/rootfiles/core/43/filelists/wireless diff --git a/config/rootfiles/core/test/filelists/wpa_supplicant b/config/rootfiles/core/43/filelists/wpa_supplicant similarity index 100% rename from config/rootfiles/core/test/filelists/wpa_supplicant rename to config/rootfiles/core/43/filelists/wpa_supplicant diff --git a/config/rootfiles/core/43/update.sh b/config/rootfiles/core/43/update.sh index 6b54995df0..3c52e01355 100644 --- a/config/rootfiles/core/43/update.sh +++ b/config/rootfiles/core/43/update.sh @@ -23,26 +23,181 @@ # . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 +# +KVER="2.6.32.26" +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 + # -#Stop services +# 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 +echo usr/bin/iw >> /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 +# Remove old iw (new is in usr/sbin) +rm -rf /usr/bin/iw +# +# Backup grub.conf +# +cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org +# +# Unpack the updated files # -#Extract files -extract_files +echo +echo Unpack the updated files ... +# +tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \ + --no-overwrite-dir + +# +# Stop services to save memory +# +/etc/init.d/snort stop +/etc/init.d/squid stop +# Convert /etc/fstab entries to UUID ... +# +echo Convert fstab entries to UUID ... +ROOT=`mount | grep " / " | cut -d" " -f1` +BOOT=`mount | grep " /boot " | cut -d" " -f1` +VAR=`mount | grep " /var " | cut -d" " -f1` +SWAP=`grep "/dev/" /proc/swaps | cut -d" " -f1` # -#Start services +if [ ! -z $ROOT ]; then + ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` + if [ ! -z $ROOTUUID ]; then + sed -i "s|^$ROOT|UUID=$ROOTUUID|g" /etc/fstab + #else + #to do add uuid to rootfs + fi + else + echo "ERROR! / not found!!!" +fi + +if [ ! -z $BOOT ]; then + BOOTUUID=`blkid -c /dev/null -sUUID $BOOT | cut -d'"' -f2` + if [ ! -z $BOOTUUID ]; then + sed -i "s|^$BOOT|UUID=$BOOTUUID|g" /etc/fstab + #else + #to do add uuid to bootfs + fi + else + echo "WARNING! /boot not found!!!" +fi + +if [ ! -z $VAR ]; then + VARUUID=`blkid -c /dev/null -sUUID $VAR | cut -d'"' -f2` + if [ ! -z $VARUUID ]; then + sed -i "s|^$VAR|UUID=$VARUUID|g" /etc/fstab + #else + #to do add uuid to varfs + fi + else + echo "WARNING! /var not found!!!" +fi + +if [ ! -z $SWAP ]; then + SWAPUUID=`blkid -c /dev/null -sUUID $SWAP | cut -d'"' -f2` + if [ ! -z $SWAPUUID ]; then + sed -i "s|^$SWAP|UUID=$SWAPUUID|g" /etc/fstab + else + # Reformat swap to add a UUID + swapoff -a + mkswap $SWAP + swapon -a + SWAPUUID=`blkid -c /dev/null -sUUID $SWAP | cut -d'"' -f2` + if [ ! -z $SWAPUUID ]; then + sed -i "s|^$SWAP|UUID=$SWAPUUID|g" /etc/fstab + fi + fi + else + echo "WARNING! swap not found!!!" +fi + +# +# Start services # -#Update Language cache -#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +/etc/init.d/squid start +/etc/init.d/snort start -#Rebuild module dep's -#depmod 2.6.32.15-ipfire -#depmod 2.6.32.15-ipfire-xen +# +# Modify grub.conf +# +echo +echo Update grub configuration ... +if [ ! -z $ROOTUUID ]; then + sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf +else + sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf +fi +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 +# +# Change /dev/hd? to /dev/sda +# +if [ "${ROOT:0:7}" == "/dev/hd" ];then + sed -i -e "s|${ROOT:0:8}|/dev/sda|g" /boot/grub/grub.conf + sed -i -e "s|${ROOT:0:8}|/dev/sda|g" /etc/fstab +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 # -#Finish -#Don't report the exitcode last command -exit 0 +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... *** " diff --git a/config/rootfiles/core/test/exclude b/config/rootfiles/core/test/exclude deleted file mode 100644 index c2bceb8667..0000000000 --- a/config/rootfiles/core/test/exclude +++ /dev/null @@ -1,6 +0,0 @@ -etc/udev/rules.d/30-persistent-network.rules -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -var/updatecache diff --git a/config/rootfiles/core/test/filelists/files b/config/rootfiles/core/test/filelists/files deleted file mode 100644 index eb3c9517ec..0000000000 --- a/config/rootfiles/core/test/filelists/files +++ /dev/null @@ -1,11 +0,0 @@ -etc/system-release -etc/rc.d/init.d/checkfs -etc/rc.d/init.d/checkfstab -etc/rc.d/init.d/squid -srv/web/ipfire/cgi-bin/proxy.cgi -srv/web/ipfire/cgi-bin/speed.cgi -srv/web/ipfire/cgi-bin/vpnmain.cgi -srv/web/ipfire/html/images/urlfilter/copy.gif -var/ipfire/general-functions.pl -usr/local/bin/rebuild-initrd -usr/bin/ldd diff --git a/config/rootfiles/core/test/meta b/config/rootfiles/core/test/meta deleted file mode 100644 index d547fa86fa..0000000000 --- a/config/rootfiles/core/test/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/test/update.sh b/config/rootfiles/core/test/update.sh deleted file mode 100644 index 3c52e01355..0000000000 --- a/config/rootfiles/core/test/update.sh +++ /dev/null @@ -1,203 +0,0 @@ -#!/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.26" -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 -echo usr/bin/iw >> /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 -# Remove old iw (new is in usr/sbin) -rm -rf /usr/bin/iw -# -# 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 - -# -# Stop services to save memory -# -/etc/init.d/snort stop -/etc/init.d/squid stop - -# Convert /etc/fstab entries to UUID ... -# -echo Convert fstab entries to UUID ... -ROOT=`mount | grep " / " | cut -d" " -f1` -BOOT=`mount | grep " /boot " | cut -d" " -f1` -VAR=`mount | grep " /var " | cut -d" " -f1` -SWAP=`grep "/dev/" /proc/swaps | cut -d" " -f1` -# - -if [ ! -z $ROOT ]; then - ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` - if [ ! -z $ROOTUUID ]; then - sed -i "s|^$ROOT|UUID=$ROOTUUID|g" /etc/fstab - #else - #to do add uuid to rootfs - fi - else - echo "ERROR! / not found!!!" -fi - -if [ ! -z $BOOT ]; then - BOOTUUID=`blkid -c /dev/null -sUUID $BOOT | cut -d'"' -f2` - if [ ! -z $BOOTUUID ]; then - sed -i "s|^$BOOT|UUID=$BOOTUUID|g" /etc/fstab - #else - #to do add uuid to bootfs - fi - else - echo "WARNING! /boot not found!!!" -fi - -if [ ! -z $VAR ]; then - VARUUID=`blkid -c /dev/null -sUUID $VAR | cut -d'"' -f2` - if [ ! -z $VARUUID ]; then - sed -i "s|^$VAR|UUID=$VARUUID|g" /etc/fstab - #else - #to do add uuid to varfs - fi - else - echo "WARNING! /var not found!!!" -fi - -if [ ! -z $SWAP ]; then - SWAPUUID=`blkid -c /dev/null -sUUID $SWAP | cut -d'"' -f2` - if [ ! -z $SWAPUUID ]; then - sed -i "s|^$SWAP|UUID=$SWAPUUID|g" /etc/fstab - else - # Reformat swap to add a UUID - swapoff -a - mkswap $SWAP - swapon -a - SWAPUUID=`blkid -c /dev/null -sUUID $SWAP | cut -d'"' -f2` - if [ ! -z $SWAPUUID ]; then - sed -i "s|^$SWAP|UUID=$SWAPUUID|g" /etc/fstab - fi - fi - else - echo "WARNING! swap not found!!!" -fi - -# -# Start services -# -/etc/init.d/squid start -/etc/init.d/snort start - -# -# Modify grub.conf -# -echo -echo Update grub configuration ... -if [ ! -z $ROOTUUID ]; then - sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf -else - sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf -fi -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 -# -# Change /dev/hd? to /dev/sda -# -if [ "${ROOT:0:7}" == "/dev/hd" ];then - sed -i -e "s|${ROOT:0:8}|/dev/sda|g" /boot/grub/grub.conf - sed -i -e "s|${ROOT:0:8}|/dev/sda|g" /etc/fstab -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... *** "