# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
+# Copyright (C) 2008 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
#
OLDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2`
NEWVERSION="2.3"
-KVER="2.6.20.21"
+KVER="2.6.23.17"
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=$_
-OLDKERNEL=`ls /boot/vmlinuz-*-ipfire | cut -d"-" -f2 | tail -n 1`
#
echo
echo Update IPFire $OLDVERSION to $NEWVERSION
#
# check if we the backup file already exist
if [ -e /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.bz2 ]; then
- echo Error! The backupfile of this update already exist!!!
- echo Have you already installed this update?
- exit 3
+ echo Moving backup to backup-old ...
+ mv -f /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.bz2 \
+ /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION-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 issue and packfire conf to backup
-echo etc/issue >> ROOTFILES
-echo opt/pakfire/etc/pakfire.conf >> ROOTFILES
+# Add some files that are not in the package to backup
+echo etc/issue >> /opt/pakfire/tmp/ROOTFILES
+echo opt/pakfire/etc/pakfire.conf >> /opt/pakfire/tmp/ROOTFILES
+echo var/spool/cron/root.orig >> /opt/pakfire/tmp/ROOTFILES
+echo etc/udev/rules.d/30-persistent-network.rules >> /opt/pakfire/tmp/ROOTFILES
+echo etc/sysconfig/lm_sensors >> /opt/pakfire/tmp/ROOTFILES
+echo var/log/rrd >> /opt/pakfire/tmp/ROOTFILES
+echo var/updatexlerator >> /opt/pakfire/tmp/ROOTFILES
+echo lib/iptables >> /opt/pakfire/tmp/ROOTFILES
+echo lib/modules >> /opt/pakfire/tmp/ROOTFILES
+echo boot >> /opt/pakfire/tmp/ROOTFILES
+echo srv/web/ipfire/cgi-bin/fwhits.cgi >> /opt/pakfire/tmp/ROOTFILES
+echo srv/web/ipfire/cgi-bin/network.cgi >> /opt/pakfire/tmp/ROOTFILES
+echo srv/web/ipfire/cgi-bin/traffics.cgi >> /opt/pakfire/tmp/ROOTFILES
+echo srv/web/ipfire/cgi-bin/graphs.cgi >> /opt/pakfire/tmp/ROOTFILES
+echo srv/web/ipfire/cgi-bin/qosgraph.cgi >> /opt/pakfire/tmp/ROOTFILES
+#
tar cjvf /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.bz2 \
- -T ROOTFILES --exclude='#*' -C / > /dev/null 2>&1
+ -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' -C / > /dev/null 2>&1
echo
-echo Update IPfire to $NEWVERSON ...
+echo Update IPfire to $NEWVERSION ...
+#
+# Delete old collectd symlink
+#
+rm -rf /etc/rc.d/rc3.d/S20collectd
+#
+# Delete squid symlink
+#
+rm -rf /etc/rc.d/rc3.d/S99squid
+#
+# Delete old cgi files ...
+#
+rm -rf /srv/web/ipfire/cgi-bin/fwhits.cgi
+rm -rf /srv/web/ipfire/cgi-bin/network.cgi
+rm -rf /srv/web/ipfire/cgi-bin/traffics.cgi
+rm -rf /srv/web/ipfire/cgi-bin/graphs.cgi
+rm -rf /srv/web/ipfire/cgi-bin/qosgraph.cgi
+#
+# Delete old iptables libs...
+#
+rm -rf /lib/iptables
+#
+# Remove old kernel, configs, initrd, modules ...
#
-# Backup the old grub config
+rm -rf /boot/System.map-*
+rm -rf /boot/config-*
+rm -rf /boot/ipfirerd-*
+rm -rf /boot/vmlinuz-*
+rm -rf /lib/modules/
#
-mv /boot/grub/grub.conf /boot/grub/grub-old.conf
+# Stopping Squid
+#
+echo
+echo Stopping Squid ...
+/etc/init.d/squid stop
#
# Unpack the updated files
#
echo
echo Unpack the updated files ...
extract_files
+#
+# Starting Squid
+#
+echo
+echo Starting Squid ...
+/etc/init.d/squid start
#
# Modify grub.conf
#
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
-echo "title Old Kernel" >> /boot/grub/grub.conf
-echo " configfile /grub/grub-old.conf" >> /boot/grub/grub.conf
-sed -i "s|/vmlinuz-ipfire|/vmlinuz-$OLDKERNEL-ipfire|g" /boot/grub/grub-old.conf
#
-# Made initramdisk
+# 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
fi
fi
mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER.img
-mkinitcpio -k $KVER-ipfire-smp -g /boot/ipfirerd-$KVER-smp.img
+#mkinitcpio -k $KVER-ipfire-smp -g /boot/ipfirerd-$KVER-smp.img
+mkinitcpio -k 2.6.25.17-ipfire -g /boot/ipfirerd-2.6.25.17.img
+#
+# ReInstall grub
+#
+grub-install --no-floppy ${ROOT::`expr length $ROOT`-1}
+#
+# Update fstab
+#
+grep -v "tmpfs" /etc/fstab > /tmp/fstab.tmp
+echo none /tmp tmpfs defaults,size=128M 0 0 >> /tmp/fstab.tmp
+echo none /var/log/rrd tmpfs defaults,size=64M 0 0 >> /tmp/fstab.tmp
+echo none /var/lock tmpfs defaults,size=16M 0 0 >> /tmp/fstab.tmp
+echo none /var/spool tmpfs defaults,size=16M 0 0 >> /tmp/fstab.tmp
+mv /tmp/fstab.tmp /etc/fstab
#
# Change version of Pakfire.conf
#
echo IPFire v$NEWVERSION - www.ipfire.org > /etc/issue
echo =================================== >> /etc/issue
echo \\n running on \\s \\r \\m >> /etc/issue
-# Core 15 begin
+#
+# Update crontab
+#
+grep -v "ipacsum" /var/spool/cron/root.orig > /tmp/root.orig.tmp
+echo "# Backup collectd files" >> /tmp/root.orig.tmp
+echo "01 * * * * /etc/init.d/collectd backup >/dev/null" >> /tmp/root.orig.tmp
+mv /tmp/root.orig.tmp /var/spool/cron/root.orig
+chmod 600 /var/spool/cron/root.orig
+chown root:cron /var/spool/cron/root.orig
+#
+# Update network-rules
+#
+sed -i 's|"net", SYSFS{address}|"net", SYSFS{type}=="1", SYSFS{address}|g' \
+ /etc/udev/rules.d/30-persistent-network.rules
+#
+# Core 17
+#
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+perl /var/ipfire/qos/bin/migrate.pl
+/var/ipfire/updatexlrator/bin/convert
+#
+# Delete old lm-sensor modullist...
+#
+rm -rf /etc/sysconfig/lm_sensors
+#
+# ISDN
+#
/etc/init.d/mISDN config
-# Core 15 end
-echo
+#
+# Remove obsolete packages, update the lists and do upgrade
+#
+echo '#!/bin/bash' > /tmp/remove_obsolete_paks
+echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/remove_obsolete_paks
+echo ' sleep 2' >> /tmp/remove_obsolete_paks
+echo 'done' >> /tmp/remove_obsolete_paks
+echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/remove_obsolete_paks
+echo ' sleep 2' >> /tmp/remove_obsolete_paks
+echo 'done' >> /tmp/remove_obsolete_paks
+echo '/opt/pakfire/pakfire remove -y mpg123 subversion zaptel' >> /tmp/remove_obsolete_paks
+echo '/opt/pakfire/pakfire update -y --force' >> /tmp/remove_obsolete_paks
+echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/remove_obsolete_paks
+echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/remove_obsolete_paks
+echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/remove_obsolete_paks
+echo 'logger -p syslog.emerg -t core-upgrade-18 "Upgrade finished. Please reboot... "' >> /tmp/remove_obsolete_paks
+#
+chmod +x /tmp/remove_obsolete_paks
+/tmp/remove_obsolete_paks &
echo
-echo Update to IPFire $NEWVERSION finished. Please reboot...
+echo Please wait until pakfire has ended...
echo