Magellan Linux

Diff of /mcore-src/trunk/mcore-install/bin/mcore-install.sh

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

revision 1605 by niro, Sun Feb 6 23:21:42 2011 UTC revision 1606 by niro, Fri Mar 4 17:08:39 2011 UTC
# Line 385  run_hardware_detection() Line 385  run_hardware_detection()
385    
386  run_hardware_detection_disks()  run_hardware_detection_disks()
387  {  {
388     local bootdev
389    
390   # all disks but exclude ramdisks   # all disks but exclude ramdisks
391   export ALL_DISKS=$(get_hwinfo disk | sed '/\/dev\/ram[0-9].*/d')   export ALL_DISKS=$(get_hwinfo disk | sed '/\/dev\/ram[0-9].*/d')
392     # remove the boot device from ALL_DISKS if it was an usbstick
393     if [[ $(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]]
394     then
395     bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"
396     export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}")
397     fi
398   export ALL_CDROMS="$(get_hwinfo cdrom)"   export ALL_CDROMS="$(get_hwinfo cdrom)"
399  }  }
400    

Legend:
Removed from v.1605  
changed lines
  Added in v.1606