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 2730 by niro, Thu Aug 11 14:28:46 2011 UTC revision 2758 by niro, Thu Aug 11 20:28:04 2011 UTC
# Line 18  NEW_ALX_DHCP_PROG="/sbin/udhcpc" Line 18  NEW_ALX_DHCP_PROG="/sbin/udhcpc"
18  NEW_ALX_DHCP_START="-T 10 -t 5 -n -i"  NEW_ALX_DHCP_START="-T 10 -t 5 -n -i"
19  NEW_ALX_DHCP_STOP=""  NEW_ALX_DHCP_STOP=""
20  NEW_MIN_DISK_SPACE="85000"  NEW_MIN_DISK_SPACE="85000"
21  NEW_ALX_PLUGINS="/etc/alxconfig-ng/plugins"  NEW_ALX_PLUGINS="/usr/lib/alxconfig-ng/plugins"
22    
23  # fake mage upgrade to prevent annoying error messages  # fake mage upgrade to prevent annoying error messages
24  if [[ ! -x /usr/sbin/mageupgrade ]]  if [[ ! -x /usr/sbin/mageupgrade ]]
# Line 79  updategrub2() Line 79  updategrub2()
79   install -m0644 /lib/grub/*/video.lst /boot/grub/video.lst   install -m0644 /lib/grub/*/video.lst /boot/grub/video.lst
80   fi   fi
81    
  # check for special hardware  
  if [[ -x $(which hwinfo) ]]  
  then  
  # zotac devices  
  if [[ ! -z $(hwinfo --bios --storage | grep -i zotac) ]]  
  then  
  grubopts="rootdelay=8"  
  echo "Special device 'ZOTAC' detected!"  
  fi  
  fi  
   
  # fix grubconfig for special devices  
  if [[ -n ${grubopts} ]]  
  then  
  sed -i "s:^\(export GRUB_CMDLINE_LINUX=\).*:\1\"${grubopts}\":" /etc/conf.d/grub  
  fi  
   
82   # update grub.cfg   # update grub.cfg
83   grub-mkconfig -o /boot/grub/grub.cfg   grub-mkconfig -o /boot/grub/grub.cfg
84    
# Line 127  if [[ ! -e /dev/root ]] Line 110  if [[ ! -e /dev/root ]]
110  then  then
111   echo "fixing missing /dev/root symlink ..."   echo "fixing missing /dev/root symlink ..."
112   rootdev=$(basename $(mount | grep ' / ' | cut -d' ' -f1))   rootdev=$(basename $(mount | grep ' / ' | cut -d' ' -f1))
113   [[ ! -e /dev/${rootdev} ]] && ln -snf ${rootdev} /dev/root   [[ -e /dev/${rootdev} ]] && ln -snf ${rootdev} /dev/root
114  fi  fi
115    
116  # update mage3 -> mage4  # update mage3 -> mage4
# Line 315  then Line 298  then
298   [[ -f ${tmp} ]] && rm -f ${tmp}   [[ -f ${tmp} ]] && rm -f ${tmp}
299   # start cron daemon in background   # start cron daemon in background
300   crond -b -S   crond -b -S
301    
302     rm -f /.dist-upgrade
303  fi  fi
304    
305  exit 0  exit 0

Legend:
Removed from v.2730  
changed lines
  Added in v.2758