#
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
#
# 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 ...
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 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 \
+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 $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
#
echo
echo Unpack the updated files ...
-extract_files
+#
+tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
+ --no-overwrite-dir
#
# Starting Squid
#
# Update fstab
#
grep -v "tmpfs" /etc/fstab > /tmp/fstab.tmp
-echo shm /dev/shm tmpfs defaults,size=25% 0 0 >> /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=32M 0 0 >> /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
#
# Update crontab
#
-grep -v "ipacsum" /var/spool/cron/root.orig > /tmp/root.orig.tmp
+grep -v "ipacsum" /var/spool/cron/root.orig | grep -v "hddshutdown" > /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
+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
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"
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
+echo 'logger -p syslog.emerg -t core-upgrade-22 "Upgrade finished. Please reboot... "' >> /tmp/remove_obsolete_paks
#
chmod +x /tmp/remove_obsolete_paks
/tmp/remove_obsolete_paks &