Dropped shm no need for 90% of our users

[people/teissler/ipfire-2.x.git] / config / rootfiles / updater / update.sh

diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh
index b1e2d9685e237c9e676969660a4556bac22ee8f0..18593dcde80298aa688cd0a86ed5271da1b02f30 100755 (executable)
--- a/config/rootfiles/updater/update.sh
+++ b/config/rootfiles/updater/update.sh
@@ -59,6 +59,8 @@ 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 cjvf /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.bz2 \
    -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' -C / > /dev/null 2>&1 
@@ -78,6 +80,8 @@ rm -rf /etc/rc.d/rc3.d/S99squid
 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...
 #
@@ -140,11 +144,21 @@ fi
 fi
 mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER.img
 #mkinitcpio -k $KVER-ipfire-smp -g /boot/ipfirerd-$KVER-smp.img
+mkinitcpio -k 2.6.25.17-ipfire -g /boot/ipfirerd-2.6.25.17.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,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/spool      tmpfs   defaults,size=16M       0       0 >> /tmp/fstab.tmp
+mv /tmp/fstab.tmp /etc/fstab
+#
 # Change version of Pakfire.conf
 #
 sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf
@@ -158,6 +172,8 @@ echo \\n running on \\s \\r \\m >> /etc/issue
 # Update crontab
 #
 grep -v "ipacsum" /var/spool/cron/root.orig > /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
 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