Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/installer-simple/bin/installer.sh.in

    Diff of /trunk/installer-simple/bin/installer.sh.in

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

    revision 2426 by niro, Tue Jan 7 14:06:18 2014 UTC revision 2430 by niro, Tue Jan 7 14:14:23 2014 UTC
    # Line 27  for inc in %SYSCONFDIR%/installer.conf \ Line 27  for inc in %SYSCONFDIR%/installer.conf \
    27   ${INSTALLER_LIBDIR}/functions/common.sh \   ${INSTALLER_LIBDIR}/functions/common.sh \
    28   ${INSTALLER_LIBDIR}/functions/common-dialogs.sh \   ${INSTALLER_LIBDIR}/functions/common-dialogs.sh \
    29   ${INSTALLER_LIBDIR}/functions/hwdetection.sh \   ${INSTALLER_LIBDIR}/functions/hwdetection.sh \
    30     ${INSTALLER_LIBDIR}/functions/bootloader.sh \
    31     ${INSTALLER_LIBDIR}/functions/initrd-tools.sh \
    32   ${INSTALLER_LIBDIR}/functions/installer-dialogs.sh   ${INSTALLER_LIBDIR}/functions/installer-dialogs.sh
    33  do  do
    34   if [ -e ${inc} ]   if [ -e ${inc} ]
    # Line 231  dialog_setup_hdd_partitions_auto() Line 233  dialog_setup_hdd_partitions_auto()
    233   fi   fi
    234  }  }
    235    
     run_hardware_detection_disks()  
     {  
      local bootdev  
       
      # all disks but exclude ramdisks  
      export ALL_DISKS=$(get_hwinfo disk | sed '/\/dev\/ram[0-9].*/d')  
      # remove the boot device from ALL_DISKS if it was an usbstick  
      if [[ $(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]]  
      then  
      bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"  
      export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}")  
      fi  
      export ALL_CDROMS="$(get_hwinfo cdrom)"  
     }  
       
    236  install_meter()  install_meter()
    237  {  {
    238   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]
    # Line 294  run_hardware_detection() Line 281  run_hardware_detection()
    281    
    282   hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"   hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"
    283    
    284   # check for special devices/clients:   ## check for special devices/clients:
    285   # if zotac a zotac and the disk is a removeable device, then add rootdelay to kernelcmd   ## if zotac a zotac and the disk is a removeable device, then add rootdelay to kernelcmd
    286   local removable=0   #local removable=0
    287   if [[ ! -z $(echo "${hwinfo}" | grep -i zotac) ]]   #if [[ ! -z $(echo "${hwinfo}" | grep -i zotac) ]]
    288   then   #then
    289   for i in /sys/block/[hs]d*/removable   #for i in /sys/block/[hs]d*/removable
    290   do   #do
    291   if [[ $(< ${i}) = 1 ]]   #if [[ $(< ${i}) = 1 ]]
    292   then   #then
    293   removable=1   #removable=1
    294   fi   #fi
    295   done   #done
    296    
    297   # only add this for grub legacy, grub2 detect these settings on its own   ## only add this for grub legacy, grub2 detect these settings on its own
    298   export GRUBLEGACYOPTS="rootdelay=8"   #export GRUBLEGACYOPTS="rootdelay=8"
    299   # there are to zotac types in the wild, nvidia based gfx and intel   ## there are to zotac types in the wild, nvidia based gfx and intel
    300   if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]   #if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]
    301   then   #then
    302   export SPECIALDEVICE="zotac_nvidia"   #export SPECIALDEVICE="zotac_nvidia"
    303   else   #else
    304   export SPECIALDEVICE="zotac_intel"   #export SPECIALDEVICE="zotac_intel"
    305   fi   #fi
    306   fi   #fi
    307    
    308   # check for special devices/clients:   # check for special devices/clients:
    309   # if a rangee and disk ist smaller then 256mb move partion one block further ahead   # if a rangee and disk ist smaller then 256mb move partion one block further ahead
    # Line 345  run_hardware_detection() Line 332  run_hardware_detection()
    332   fi   fi
    333  }  }
    334    
    335    run_hardware_detection_disks()
    336    {
    337     local bootdev
    338    
    339     # all disks but exclude ramdisks
    340     export ALL_DISKS=$(get_hwinfo disk | sed '/\/dev\/ram[0-9].*/d')
    341     # remove the boot device from ALL_DISKS if it was an usbstick
    342     if [[ $(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]]
    343     then
    344     bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"
    345     export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}")
    346     fi
    347     export ALL_CDROMS="$(get_hwinfo cdrom)"
    348    }
    349    
    350  hdd_size_below_256mb()  hdd_size_below_256mb()
    351  {  {
    352   local hdd="$1"   local hdd="$1"
    # Line 715  run_install_normal() Line 717  run_install_normal()
    717   dialog_install_settings   dialog_install_settings
    718   sleep 1   sleep 1
    719   install_system_settings   install_system_settings
    720     dialog_install_initrd
    721   install_initrd_chroot   install_initrd_chroot
    722    
    723   dialog_install_bootsector   dialog_install_bootsector
    # Line 737  run_install_auto() Line 740  run_install_auto()
    740   dialog_install_settings   dialog_install_settings
    741   sleep 1   sleep 1
    742   install_system_settings   install_system_settings
    743     dialog_install_initrd
    744   install_initrd_chroot   install_initrd_chroot
    745    
    746   dialog_install_bootsector   dialog_install_bootsector
    Legend:
    Removed from v.2426  
    changed lines
      Added in v.2430