Magellan Linux

Diff of /mage/trunk/profiles/alx-060/forced-uninstall

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3121 by niro, Mon Aug 29 20:14:35 2011 UTC revision 3122 by niro, Thu Sep 8 19:25:26 2011 UTC
# Line 236  fi Line 236  fi
236    
237  if [[ -f /.dist-upgrade ]]  if [[ -f /.dist-upgrade ]]
238  then  then
239     # busybox gets installed before the new busybox initscripts
240     # and the syslog daemon gets started at the wrong runlevels (rc3.d instead of rc.sysinit)
241     # these runlevel symlinks will be deleted by the prune-orphaned-files script
242     # and syslogd will be left never started. so add syslogd here
243     rc-config add syslogd
244    
245   # array of wireless opts   # array of wireless opts
246   WIRELESS_OPTS=( WIRELESS_BITRATE WIRELESS_CHANNEL WIRELESS_ESSID WIRELESS_FREQUENCY WIRELESS_MODE WIRELESS_NICK WIRELESS_AUTH_MODE WIRELESS_KEY_LENGTH WIRELESS_KEY WIRELESS_KEY_ASCII WIRELESS_WPA_DRIVER )   WIRELESS_OPTS=( WIRELESS_BITRATE WIRELESS_CHANNEL WIRELESS_ESSID WIRELESS_FREQUENCY WIRELESS_MODE WIRELESS_NICK WIRELESS_AUTH_MODE WIRELESS_KEY_LENGTH WIRELESS_KEY WIRELESS_KEY_ASCII WIRELESS_WPA_DRIVER )
247    
# Line 284  then Line 290  then
290   FBMODS="uvesafb"   FBMODS="uvesafb"
291   echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS}\"" > /etc/conf.d/mkinitrd   echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS}\"" > /etc/conf.d/mkinitrd
292   kernelver=$(readlink /boot/vmlinuz | sed 's:kernel-::')   kernelver=$(readlink /boot/vmlinuz | sed 's:kernel-::')
293     # run depmod before
294     depmod -aF /boot/System.map-${kernelver}
295   mkinitrd -f /boot/initrd-${kernelver}.img ${kernelver}   mkinitrd -f /boot/initrd-${kernelver}.img ${kernelver}
296   # update grub bootloader   # update grub bootloader
297   updategrub2   updategrub2
# Line 291  fi Line 299  fi
299    
300  if [[ -f /.dist-upgrade ]]  if [[ -f /.dist-upgrade ]]
301  then  then
302   echo "preparing a reboot in 60 seconds ..."   echo "preparing for a reboot in 60 seconds ..."
303   # reboot via cronjob   # reboot via cronjob
304   [[ ! -d /var/spool/cron/crontabs ]] && install -d /var/spool/cron/crontabs   [[ ! -d /var/spool/cron/crontabs ]] && install -d /var/spool/cron/crontabs
305   # setup a proper cronjob   # setup a proper cronjob
306   tmp=$(mktemp)   tmp=$(mktemp)
307   echo "* * * * * crontab -r && reboot -f" > ${tmp}   :> ${tmp}
308     # fake mageupgrade to fix annoying error messages
309     if [[ ! -x /sbin/mageupgrade ]]
310     then
311     echo '#!/bin/sh' > /sbin/mageupgrade
312     echo 'exit 0'  >> /sbin/mageupgrade
313     chmod +x /sbin/mageupgrade
314     echo "* * * * * rm /sbin/mageupgrade" >> ${tmp}
315     fi
316     echo "* * * * * crontab -r && reboot -f" >> ${tmp}
317   crontab ${tmp}   crontab ${tmp}
318   [[ -f ${tmp} ]] && rm -f ${tmp}   [[ -f ${tmp} ]] && rm -f ${tmp}
319   # start cron daemon in background   # start cron daemon in background

Legend:
Removed from v.3121  
changed lines
  Added in v.3122