# 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.23.17"
+KVER="2.6.25.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=$_
-OLDKERNEL=`ls /boot/vmlinuz-*-ipfire | cut -d"-" -f2 | tail -n 1`
#
echo
echo Update IPFire $OLDVERSION to $NEWVERSION
echo
#
# check if we the backup file already exist
-if [ -e /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.bz2 ]; then
+if [ -e /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.gz ]; then
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
+ mv -f /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.gz \
+ /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION-old.tar.gz
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
+# 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
-tar cjvf /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.bz2 \
+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/log/vnstat >> /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 czvf /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.gz \
-T /opt/pakfire/tmp/ROOTFILES --exclude='#*' -C / > /dev/null 2>&1
echo
-echo Update IPfire to $NEWVERSON ...
+echo Update IPfire to $NEWVERSION ...
+#
+# On some systems the folder for addon backups is missing
+#
+if [ ! -e /var/ipfire/backup/addons/backup ]; then
+ mkdir -p /var/ipfire/backup/addons/backup
+fi
#
# Delete old collectd symlink
#
rm -rf /etc/rc.d/rc3.d/S20collectd
#
-# Backup the old grub config
+# 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 ...
#
-mv /boot/grub/grub.conf /boot/grub/grub-old.conf
+rm -rf /boot/System.map-*
+rm -rf /boot/config-*
+rm -rf /boot/ipfirerd-*
+rm -rf /boot/vmlinuz-*
+rm -rf /lib/modules/
+#
+# Stopping Squid
+#
+echo
+echo Stopping Squid ...
+/etc/init.d/squid stop
#
# Unpack the updated files
#
echo
echo Unpack the updated files ...
-extract_files
+#
+tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
+ --no-overwrite-dir
+#
+# 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 emergency - initramdisk
#
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
+#
+# 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 0 0" >> /tmp/fstab.tmp
+echo "none /var/log/rrd tmpfs defaults,size=112M 0 0" >> /tmp/fstab.tmp
+echo "none /var/lock tmpfs defaults,size=8M 0 0" >> /tmp/fstab.tmp
+echo "none /var/run tmpfs defaults,size=8M 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 17 begin
+#
+# Update crontab
+#
+grep -v "ipacsum" /var/spool/cron/root.orig | grep -v "hddshutdown" > /tmp/root.orig.tmp
+echo "# Backup collectd files" >> /tmp/root.orig.tmp
+echo "* 05 * * * /etc/init.d/tmpfs backup >/dev/null" >> /tmp/root.orig.tmp
+echo "# hddshutdown" >> /tmp/root.orig.tmp
+echo "*/30 * * * * /usr/local/bin/hddshutdown >/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
+#
+# Move vnstat database to /var/log/rrd
+#
+mkdir -p /var/log/rrd.bak/vnstat
+mkdir -p /var/log/rrd/vnstat
+if [ -e /var/log/vnstat ]; then
+ cp -pR /var/log/vnstat /var/log/rrd.bak/vnstat
+ mv /var/log/vnstat /var/log/rrd/vnstat
+fi
+#
+# Fix qos.sh
+#
+sed -i 's|rmmod imq|#rmmod imq|g' /var/ipfire/qos/bin/qos.sh
+#
+# 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 17 end
#
-# Remove obsolete packages
+# 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 '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 zaptel -y' >> /tmp/remove_obsolete_paks
-echo '/opt/pakfire/pakfire update --force' >> /tmp/remove_obsolete_paks
-echo 'echo' >> /tmp/remove_obsolete_paks
-echo 'echo Update to IPFire $NEWVERSION finished. Please reboot... ' >> /tmp/remove_obsolete_paks
-echo 'echo' >> /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-20 "Upgrade finished. Please reboot... "' >> /tmp/remove_obsolete_paks
+#
chmod +x /tmp/remove_obsolete_paks
/tmp/remove_obsolete_paks &
echo
projects / people / teissler / ipfire-2.x.git / blobdiff