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 2342 by niro, Fri Jan 3 14:57:23 2014 UTC revision 2344 by niro, Fri Jan 3 15:01:06 2014 UTC
    # Line 46  source ${INSTALLER_LIBDIR}/functions/hwd Line 46  source ${INSTALLER_LIBDIR}/functions/hwd
    46  VERSION="%VERSIONTAG%"  VERSION="%VERSIONTAG%"
    47  TITLE="${DEFAULT_TITLE} - ${VERSION}"  TITLE="${DEFAULT_TITLE} - ${VERSION}"
    48    
    49  CDPATH="${DEFAULT_CDPATH}"  CDROOT="${DEFAULT_CDROOT}"
    50  INSTALLROOT="${DEFAULT_INSTALLROOT}"  INSTALLROOT="${DEFAULT_INSTALLROOT}"
    51    
    52  # standard kernel opts  # standard kernel opts
    # Line 187  dialog_hardware_detection() Line 187  dialog_hardware_detection()
    187   hwtmp="/tmp/hwtmp.sh"   hwtmp="/tmp/hwtmp.sh"
    188   fi   fi
    189    
    190   [[ ! -z ${installdevs} ]] && installdevs=""   run_hardware_detection_disks
    191    
    192   echo "dialog \\"  > ${hwtmp}   echo "dialog \\"  > ${hwtmp}
    193   echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}   echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}
    # Line 197  dialog_hardware_detection() Line 197  dialog_hardware_detection()
    197   echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}   echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}
    198   echo " Festplatten:\n \\" >> ${hwtmp}   echo " Festplatten:\n \\" >> ${hwtmp}
    199    
    200   if [[ ! -z ${scsidisks} ]]   if [[ ! -z ${ALL_DISKS} ]]
    201   then   then
    202   for i in ${scsidisks}   for i in ${ALL_DISKS}
    203   do   do
    204   if [[ ${i} != ${cdromdev} ]]   echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}
      then  
      echo " \\Z7SCSI: \\Z3${i}\\Zn\n \\" >> ${hwtmp}  
      installdevs="${installdevs} ${i}"  
      fi  
    205   done   done
    206   fi   fi
    207    
    208   if [[ ! -z ${idedisks} ]]   if [[ ! -z ${ALL_CDROMS} ]]
    209   then   then
    210   for i in ${idedisks}   echo " \n \\" >> ${hwtmp}
    211     echo " CDROM Laufwerke:\n \\" >> ${hwtmp}
    212     for i in ${ALL_CDROMS}
    213   do   do
    214   if [[ ${i} != ${cdromdev} ]]   echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}
      then  
      echo " \\Z7IDE:  \\Z3${i}\\Zn\n \\" >> ${hwtmp}  
      installdevs="${installdevs} ${i}"  
      fi  
    215   done   done
    216   fi   fi
    217    
      if [[ ! -z ${cdromdev} ]]  
      then  
      echo " \n \\" >> ${hwtmp}  
      echo " \\Z7andere Laufwerke:\n \\" >> ${hwtmp}  
      echo " CDROM: \\Z3${cdromdev}\\Zn\n \\" >> ${hwtmp}  
      fi  
       
    218   # other devices   # other devices
    219   run_hardware_detection   run_hardware_detection
    220   case "${SPECIALDEVICE}" in   case "${SPECIALDEVICE}" in
    # Line 367  dialog_setup_hdd_partitions_auto() Line 354  dialog_setup_hdd_partitions_auto()
    354   fi   fi
    355  }  }
    356    
    357    run_hardware_detection_disks()
    358    {
    359     local bootdev
    360    
    361     # all disks but exclude ramdisks
    362     export ALL_DISKS=$(get_hwinfo disk | sed '/\/dev\/ram[0-9].*/d')
    363     # remove the boot device from ALL_DISKS if it was an usbstick
    364     if [[ $(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]]
    365     then
    366     bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"
    367     export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}")
    368     fi
    369     export ALL_CDROMS="$(get_hwinfo cdrom)"
    370    }
    371    
    372  dialog_setup_hdd_create_partitions()  dialog_setup_hdd_create_partitions()
    373  {  {
    374   dialog \   dialog \
    # Line 652  install_mount_rootfs_flash() Line 654  install_mount_rootfs_flash()
    654    
    655  install_system_image()  install_system_image()
    656  {  {
    657   tar xvjpf ${CDPATH}/system/${CDIMAGENAME} -C ${INSTALLROOT}   tar xvjpf ${CDROOT}/system/${CDIMAGENAME} -C ${INSTALLROOT}
    658  }  }
    659    
    660  install_bootsector_chroot()  install_bootsector_chroot()
    Legend:
    Removed from v.2342  
    changed lines
      Added in v.2344