From: Arne Fitzenreiter Date: Thu, 14 Aug 2008 16:21:32 +0000 (+0200) Subject: Remove ipacsum from contab X-Git-Tag: v2.3-beta3~38 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b50da9df78825a01960a6f7403824eecb135acc;p=people%2Fms%2Fipfire-2.x.git Remove ipacsum from contab Update some settings in the updater --- diff --git a/config/cron/crontab b/config/cron/crontab index ff15423575..0fa7ebcc2b 100644 --- a/config/cron/crontab +++ b/config/cron/crontab @@ -20,11 +20,6 @@ HOME=/ # Set time */5 * * * * /usr/local/bin/timecheck > /dev/null 2>&1 -# Summarize ip accounting info: -2 1 * * * /usr/sbin/ipacsum -r -H `/bin/hostname` -t "the day 2 days ago" >/dev/null -3 1 * * 0 /usr/sbin/ipacsum -r -H `/bin/hostname` -t "the week 4 weeks ago" >/dev/null -4 1 1 2 * /usr/sbin/ipacsum -r -H `/bin/hostname` -t "the year 2 years ago" >/dev/null - # Make some nice graphs */5 * * * * /usr/local/bin/makegraphs >/dev/null diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh index ddcbbcc5cd..f66c9d18d3 100755 --- a/config/rootfiles/updater/update.sh +++ b/config/rootfiles/updater/update.sh @@ -17,7 +17,7 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007 IPFire-Team . # +# Copyright (C) 2008 IPFire-Team . # # # ############################################################################ # @@ -46,9 +46,12 @@ if [ -e /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.bz2 ]; then fi echo First we made a backup of all files that was inside of the echo update archive. This may take a while ... -# Add issue and packfire conf to backup +# Add some files that are not in the package to backup echo etc/issue >> /opt/pakfire/tmp/ROOTFILES echo opt/pakfire/etc/pakfire.conf >> /opt/pakfire/tmp/ROOTFILES +echo var/spool/cron/root.orig >> /opt/pakfire/tmp/ROOTFILES +echo etc/udev/rules.d/30-persistant-network.rules >> /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 echo @@ -62,6 +65,11 @@ rm -rf /etc/rc.d/rc3.d/S20collectd # mv /boot/grub/grub.conf /boot/grub/grub-old.conf # +# Remove the kernel modules of the new kernel (only needed if this update run +# over an already updated system) +# +rm -rf /lib/modules/$KVER-ipfire +# # Unpack the updated files # echo @@ -112,6 +120,19 @@ sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf echo IPFire v$NEWVERSION - www.ipfire.org > /etc/issue echo =================================== >> /etc/issue echo \\n running on \\s \\r \\m >> /etc/issue +# +# Update crontab +# +grep -v "ipacsum" /var/spool/cron/root.orig > /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 +# +# Update network-rules +# +sed -i 's|"net", SYSFS{"address"}|"net", SYSFS{"type"}=="1", SYSFS{"address"}|g' \ + /etc/udev/rules.d/30-persistant-network.rules +# # Core 17 begin perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" /etc/init.d/mISDN config @@ -128,6 +149,7 @@ echo ' sleep 2' >> /tmp/remove_obsolet echo 'done' >> /tmp/remove_obsolete_paks echo '/opt/pakfire/pakfire remove zaptel -y' >> /tmp/remove_obsolete_paks echo '/opt/pakfire/pakfire update --force' >> /tmp/remove_obsolete_paks +echo '/opt/pakfire/pakfire upgrade' >> /tmp/remove_obsolete_paks echo 'echo' >> /tmp/remove_obsolete_paks echo 'echo Update to IPFire $NEWVERSION finished. Please reboot... ' >> /tmp/remove_obsolete_paks echo 'echo' >> /tmp/remove_obsolete_paks