Magellan Linux

Diff of /mage/branches/alx-0_6_0/include/alx.minc

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

revision 2734 by niro, Thu Aug 11 14:30:15 2011 UTC revision 2735 by niro, Thu Aug 11 14:51:53 2011 UTC
# Line 57  alx_grub_update() Line 57  alx_grub_update()
57    
58   [ -z "${KERNEL_DESCRIPTION}" ] && KERNEL_DESCRIPTION="${KERNEL_IMAGE}"   [ -z "${KERNEL_DESCRIPTION}" ] && KERNEL_DESCRIPTION="${KERNEL_IMAGE}"
59    
  # 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  
   
60   # grub2   # grub2
61   if [[ -x /sbin/grub-mkconfig ]]   if [[ -x /sbin/grub-mkconfig ]]
62   then   then
# Line 83  alx_grub_update() Line 72  alx_grub_update()
72   install -m0644 /$(mlibdir)/grub/*/video.lst /boot/grub/video.lst   install -m0644 /$(mlibdir)/grub/*/video.lst /boot/grub/video.lst
73   fi   fi
74    
  # fix grubconfig for special devices  
  if [[ -n ${grubopts} ]]  
  then  
  sed -i "s:^\(export GRUB_CMDLINE_LINUX=\).*:\1\"${grubopts}\":" /etc/conf.d/grub  
  fi  
   
75   # update grub.cfg   # update grub.cfg
76   LC_ALL=C grub-mkconfig -o ${grub2conf}   LC_ALL=C grub-mkconfig -o ${grub2conf}
77    
# Line 126  alx_grub_update() Line 109  alx_grub_update()
109   done   done
110   IFS="${OLD_IFS}"   IFS="${OLD_IFS}"
111    
112     # check for special hardware
113     if [[ -x $(which hwinfo) ]]
114     then
115     # zotac devices
116     if [[ ! -z $(hwinfo --bios --storage | grep -i zotac) ]]
117     then
118     grubopts="rootdelay=8"
119     echo "Special device 'ZOTAC' detected!"
120     fi
121     fi
122    
123   # fix description   # fix description
124   : > ${grubconf}   : > ${grubconf}
125   echo "default 0" >> ${grubconf}   echo "default 0" >> ${grubconf}

Legend:
Removed from v.2734  
changed lines
  Added in v.2735