--- mage/branches/alx-0_6_0/profiles/alx-060/forced-uninstall 2011/09/22 09:22:53 3257 +++ mage/branches/alx-0_6_0/profiles/alx-060/forced-uninstall 2011/09/28 13:07:28 3258 @@ -366,25 +366,28 @@ if [[ -f /.dist-upgrade ]] then - echo "preparing for a reboot in 60 seconds ..." - # reboot via cronjob - [[ ! -d /var/spool/cron/crontabs ]] && install -d /var/spool/cron/crontabs - # setup a proper cronjob - tmp=$(mktemp) - :> ${tmp} - # fake mageupgrade to fix annoying error messages - if [[ ! -x /sbin/mageupgrade ]] + if [[ ${NOREBOOT} != 1 ]] then - echo '#!/bin/sh' > /sbin/mageupgrade - echo 'exit 0' >> /sbin/mageupgrade - chmod +x /sbin/mageupgrade - echo "* * * * * rm /sbin/mageupgrade" >> ${tmp} + echo "preparing for a reboot in 60 seconds ..." + # reboot via cronjob + [[ ! -d /var/spool/cron/crontabs ]] && install -d /var/spool/cron/crontabs + # setup a proper cronjob + tmp=$(mktemp) + :> ${tmp} + # fake mageupgrade to fix annoying error messages + if [[ ! -x /sbin/mageupgrade ]] + then + echo '#!/bin/sh' > /sbin/mageupgrade + echo 'exit 0' >> /sbin/mageupgrade + chmod +x /sbin/mageupgrade + echo "* * * * * rm /sbin/mageupgrade" >> ${tmp} + fi + echo "* * * * * crontab -r && reboot -f" >> ${tmp} + crontab ${tmp} + [[ -f ${tmp} ]] && rm -f ${tmp} + # start cron daemon in background + crond -b -S fi - echo "* * * * * crontab -r && reboot -f" >> ${tmp} - crontab ${tmp} - [[ -f ${tmp} ]] && rm -f ${tmp} - # start cron daemon in background - crond -b -S rm -f /.dist-upgrade fi