Updater: Fix fstab modify
Updater: update vnstat path
Syslog: create an extra log at boot to short the time at syslog start
etc/modprobe.d/blacklist
usr/bin/bc
usr/bin/dc
etc/modprobe.d/blacklist
usr/bin/bc
usr/bin/dc
etc/ppp/dialer
etc/rc.d/init.d/checkfstab
etc/rc.d/rcsysinit.d/S19checkfstab
etc/ppp/dialer
etc/rc.d/init.d/checkfstab
etc/rc.d/rcsysinit.d/S19checkfstab
etc/rc.d/rc3.d/S01tmpfs
etc/rc.d/rc6.d/K85tmpfs
etc/rc.d/init.d/dnsmasq
etc/rc.d/rc3.d/S01tmpfs
etc/rc.d/rc6.d/K85tmpfs
etc/rc.d/init.d/dnsmasq
+etc/rc.d/init.d/sysklogd
etc/rc.d/init.d/network
etc/rc.d/init.d/networking/any
etc/rc.d/init.d/networking/red
etc/rc.d/init.d/network
etc/rc.d/init.d/networking/any
etc/rc.d/init.d/networking/red
echo
#
# check if we the backup file already exist
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 ...
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 ...
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 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 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
#
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 ...
-T /opt/pakfire/tmp/ROOTFILES --exclude='#*' -C / > /dev/null 2>&1
echo
echo Update IPfire to $NEWVERSION ...
# Update fstab
#
grep -v "tmpfs" /etc/fstab > /tmp/fstab.tmp
# 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,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
mv /tmp/fstab.tmp /etc/fstab
#
# Change version of Pakfire.conf
mv /tmp/fstab.tmp /etc/fstab
#
# Change version of Pakfire.conf
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 "# 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
+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
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
perl /var/ipfire/qos/bin/migrate.pl
/var/ipfire/updatexlrator/bin/convert
#
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
# Delete old lm-sensor modullist...
#
rm -rf /etc/sysconfig/lm_sensors
+ boot_mesg "Starting kernel log daemon..."
+ loadproc klogd
+
boot_mesg "Starting system log daemon..."
loadproc syslogd -m 0
boot_mesg "Starting system log daemon..."
loadproc syslogd -m 0
- boot_mesg "Starting kernel log daemon..."
- loadproc klogd
+ boot_mesg "Saving Bootlog..."
+ if [ -e /var/log/bootlog ]; then
+ mv -f /var/log/bootlog /var/log/bootlog.old
+ fi
+ dmesg -c > /var/log/bootlog
+ evaluate_retval
stop)
boot_mesg "Stopping kernel log daemon..."
killproc klogd
stop)
boot_mesg "Stopping kernel log daemon..."
killproc klogd