Updater / sysklog@boot

Updater: Fix fstab modify
Updater: update vnstat path
Syslog: create an extra log at boot to short the time at syslog start

diff --git a/config/rootfiles/updater/filelists/files b/config/rootfiles/updater/filelists/files
index 0c95631da64e6d22e9a9c38c199769fd844565d6..75e18a8ce5135695ae0b11c962108729f08708d3 100644 (file)
--- a/config/rootfiles/updater/filelists/files
+++ b/config/rootfiles/updater/filelists/files
@@ -3,7 +3,6 @@ etc/init.d/mISDN
 etc/modprobe.d/blacklist
 usr/bin/bc
 usr/bin/dc
-etc/fstab
 etc/ppp/dialer
 etc/rc.d/init.d/checkfstab
 etc/rc.d/rcsysinit.d/S19checkfstab
@@ -13,6 +12,7 @@ etc/rc.d/rc0.d/K85tmpfs
 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

diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh
index 95de204577efd2487a00c2fc882ea58ab4f6f078..dd9eadfb6b431958a8da9beecf03e83f76747a39 100755 (executable)
--- a/config/rootfiles/updater/update.sh
+++ b/config/rootfiles/updater/update.sh
@@ -38,10 +38,10 @@ 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 ...
@@ -52,6 +52,7 @@ 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
@@ -62,7 +63,7 @@ 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 \
+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 ...
@@ -152,10 +153,10 @@ 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/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
@@ -174,7 +175,7 @@ grep -v "ipacsum" /var/spool/cron/root.orig | grep -v "hddshutdown" > /tmp/root.
 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
@@ -190,6 +191,12 @@ 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

diff --git a/src/initscripts/init.d/sysklogd b/src/initscripts/init.d/sysklogd
index 1912df4087705b321ac8e29becc2c8d06102e9e9..7aa9a4c02f7dd6d05afce202b599b08b2c7d4b96 100644 (file)
--- a/src/initscripts/init.d/sysklogd
+++ b/src/initscripts/init.d/sysklogd
@@ -17,13 +17,19 @@
 
 case "${1}" in
        start)
+               boot_mesg "Starting kernel log daemon..."
+               loadproc klogd
+
                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