Magellan Linux

Diff of /mage/branches/alx-0_6_0/profiles/alx-060/forced-uninstall

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

revision 3212 by niro, Wed Sep 14 13:29:04 2011 UTC revision 3271 by niro, Wed Sep 28 15:11:22 2011 UTC
# Line 336  then Line 336  then
336   echo "options uvesafb mode_option=1024x768-32@60 scroll=ywrap" > /etc/modprobe.d/uvesafb.conf || die   echo "options uvesafb mode_option=1024x768-32@60 scroll=ywrap" > /etc/modprobe.d/uvesafb.conf || die
337   # install an appropriate viafb.conf   # install an appropriate viafb.conf
338   echo "options viafb viafb_mode=1024x768 viafb_refresh=60" > /etc/modprobe.d/viafb.conf || die   echo "options viafb viafb_mode=1024x768 viafb_refresh=60" > /etc/modprobe.d/viafb.conf || die
339     # install an appropriate i810fb.conf
340     echo "echo i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"  > /etc/modprobe.d/i810fb.conf || die
341   # create an updated initrd   # create an updated initrd
342   DISKMODS="sd_mod"   DISKMODS="sd_mod"
343   OLDPATAMODS="amd74xx piix sis5513 via82cxxx"   OLDPATAMODS="amd74xx piix sis5513 via82cxxx"
# Line 346  then Line 348  then
348   then   then
349   case $(/usr/sbin/alx-hwdetection system) in   case $(/usr/sbin/alx-hwdetection system) in
350   zotac) FBMODS="" ;;   zotac) FBMODS="" ;;
351   rangee) FBMODS="viafb" ;;   rangee) FBMODS="" ;; ## fallback to vesafb, viafb does not run on all CLE266 boards
352     maxdata) FBMODS="i810fb" ;; ## check for maxdata / i810/ i815 Chipsets and disable KMS and use i810fb frambuffer
353   standard) FBMODS="uvesafb" ;;   standard) FBMODS="uvesafb" ;;
354   # unkown, use nothing to be safe   # unkown, use nothing to be safe
355   *) FBMODS="" ;;   *) FBMODS="" ;;
# Line 366  fi Line 369  fi
369    
370  if [[ -f /.dist-upgrade ]]  if [[ -f /.dist-upgrade ]]
371  then  then
372   echo "preparing for a reboot in 60 seconds ..."   if [[ ${NOREBOOT} != 1 ]]
  # 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 ]]  
373   then   then
374   echo '#!/bin/sh' > /sbin/mageupgrade   echo "preparing for a reboot in 60 seconds ..."
375   echo 'exit 0'  >> /sbin/mageupgrade   # reboot via cronjob
376   chmod +x /sbin/mageupgrade   [[ ! -d /var/spool/cron/crontabs ]] && install -d /var/spool/cron/crontabs
377   echo "* * * * * rm /sbin/mageupgrade" >> ${tmp}   # setup a proper cronjob
378     tmp=$(mktemp)
379     :> ${tmp}
380     # fake mageupgrade to fix annoying error messages
381     if [[ ! -x /sbin/mageupgrade ]]
382     then
383     echo '#!/bin/sh' > /sbin/mageupgrade
384     echo 'exit 0'  >> /sbin/mageupgrade
385     chmod +x /sbin/mageupgrade
386     echo "* * * * * rm /sbin/mageupgrade" >> ${tmp}
387     fi
388     echo "* * * * * crontab -r && reboot -f" >> ${tmp}
389     crontab ${tmp}
390     [[ -f ${tmp} ]] && rm -f ${tmp}
391     # start cron daemon in background
392     crond -b -S
393   fi   fi
  echo "* * * * * crontab -r && reboot -f" >> ${tmp}  
  crontab ${tmp}  
  [[ -f ${tmp} ]] && rm -f ${tmp}  
  # start cron daemon in background  
  crond -b -S  
394    
395   rm -f /.dist-upgrade   rm -f /.dist-upgrade
396  fi  fi

Legend:
Removed from v.3212  
changed lines
  Added in v.3271