#
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
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 "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/run tmpfs defaults,size=16M 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
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
#
-# Move vnstat database to /var/log/rrd
-#
-mkdir -p /var/log/rrd.bak/vnstat
-cp /var/log/vnstat /var/log/rrd.bak/vnstat
-mv /var/log/vnstat /var/log/rrd/vnstat
-#
# Delete old lm-sensor modullist...
#
rm -rf /etc/sysconfig/lm_sensors
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-20 "Upgrade finished. Please reboot... "' >> /tmp/remove_obsolete_paks
#
chmod +x /tmp/remove_obsolete_paks
/tmp/remove_obsolete_paks &