Magellan Linux

  • Back to homepage
    • /[alx-svn]/alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in

    Diff of /alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in

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

    revision 6825 by niro, Thu Jul 23 10:50:11 2015 UTC revision 6826 by niro, Thu Jul 23 11:26:26 2015 UTC
    # Line 81  dialog_warning() Line 81  dialog_warning()
    81    
    82  dialog_setup_hdd_info()  dialog_setup_hdd_info()
    83  {  {
    84     case "${INSTALL_METHOD}" in
    85     auto)
    86     dialog_setup_hdd_info_auto
    87     dialog_setup_hdd_create_partitions
    88     ;;
    89     normal) dialog_setup_hdd_info_normal ;;
    90     single) dialog_setup_hdd_info_single ;;
    91     esac
    92    }
    93    
    94    dialog_setup_hdd_info_normal()
    95    {
    96   local SHDD="$(echo ${HDD} | sed 's/\/dev\///')"   local SHDD="$(echo ${HDD} | sed 's/\/dev\///')"
    97    
    98   dialog \   dialog \
    # Line 217  dialog_hardware_detection() Line 229  dialog_hardware_detection()
    229   fi   fi
    230  }  }
    231    
    232  dialog_setup_hdd_partitions_manuell()  dialog_setup_hdd_partitions()
    233  {  {
    234   local i   local i
    235    
    # Line 250  dialog_setup_hdd_partitions_manuell() Line 262  dialog_setup_hdd_partitions_manuell()
    262   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
    263   then   then
    264   dialog_setup_hdd_info   dialog_setup_hdd_info
    265   setup_hdd_partitions_manuell   setup_hdd_partitions
      fi  
      fi  
     }  
       
     dialog_setup_hdd_partitions_manuell_single()  
     {  
      local i  
       
      if [[ -z ${ALL_DISKS} ]]  
      then  
      dialog \  
      --backtitle "${TITLE}" \  
      --ok-label "Beenden" \  
      --msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70  
      exit 1  
      else  
       
      echo "dialog \\" > /tmp/hddtmp.sh  
      echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh  
      echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh  
      echo "--cancel-label \"Beenden\" \\" >> /tmp/hddtmp.sh  
      echo "--stdout \\" >> /tmp/hddtmp.sh  
      echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh  
       
      for i in ${ALL_DISKS}  
      do  
      echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh  
      done  
      echo -e "\n" >> /tmp/hddtmp.sh  
       
      chmod a+x /tmp/hddtmp.sh  
      HDD="$(/tmp/hddtmp.sh)"  
      RES=$?  
      [[ ${RES} -eq 1 ]] && return 1  
      if [[ ${RES} -eq 0 ]]  
      then  
      dialog_setup_hdd_info_single  
      setup_hdd_partitions_manuell_single  
      fi  
      fi  
     }  
       
     dialog_setup_hdd_partitions_auto()  
     {  
      local i  
       
      if [[ -z ${ALL_DISKS} ]]  
      then  
      dialog \  
      --backtitle "${TITLE}" \  
      --ok-label "Beenden" \  
      --msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70  
      exit 1  
      else  
       
      echo "dialog \\" > /tmp/hddtmp.sh  
      echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh  
      echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh  
      echo "--cancel-label \"Beenden\" \\" >> /tmp/hddtmp.sh  
      echo "--stdout \\" >> /tmp/hddtmp.sh  
      echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh  
       
      for i in ${ALL_DISKS}  
      do  
      echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh  
      done  
      echo -e "\n" >> /tmp/hddtmp.sh  
       
      chmod a+x /tmp/hddtmp.sh  
      HDD="$(/tmp/hddtmp.sh)"  
      RES=$?  
      [[ ${RES} -eq 1 ]] && return 1  
      if [[ ${RES} -eq 0 ]]  
      then  
      dialog_setup_hdd_info_auto  
      dialog_setup_hdd_create_partitions  
      setup_hdd_partitions_auto  
    266   fi   fi
    267   fi   fi
    268  }  }
    # Line 538  hdd_size_below_256mb() Line 473  hdd_size_below_256mb()
    473   return "${retval}"   return "${retval}"
    474  }  }
    475    
    476  setup_hdd_partitions_auto()  setup_hdd_partitions()
    477  {  {
    478   ROOTHDD="${HDD}1"   case "${INSTALL_METHOD}" in
    479     normal)
    480     BOOTHDD="${HDD}1"
    481     SWAPHDD="${HDD}2"
    482     ROOTHDD="${HDD}3"
    483     ;;
    484    
    485   # run this only if FDISKPARTITIONBELOW256MB is not already 1   single|auto)
    486   if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]   ROOTHDD="${HDD}1"
    487     ;;
    488     esac
    489    
    490     if [[ ${INSTALL_METHOD} = auto ]]
    491   then   then
    492   if hdd_size_below_256mb ${HDD}   # run this only if FDISKPARTITIONBELOW256MB is not already 1
    493     if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
    494   then   then
    495   FDISKPARTIONBELOW256MB=1   if hdd_size_below_256mb ${HDD}
    496   else   then
    497   FDISKPARTIONBELOW256MB=0   FDISKPARTIONBELOW256MB=1
    498     else
    499     FDISKPARTIONBELOW256MB=0
    500     fi
    501   fi   fi
      fi  
    502    
    503   ## delete disk   ## delete disk
    504   dd if=/dev/zero of=${HDD} count=1 &> /dev/null || die   dd if=/dev/zero of=${HDD} count=1 &> /dev/null || die
    505    
    506   if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]   if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]
    507   then   then
    508   ## setup one bootable partition   ## setup one bootable partition
    509   #1. n= new disk   #1. n= new disk
    510   #2. p= primary disk   #2. p= primary disk
    511   #3. 1= first partition   #3. 1= first partition
    512   #4. 2= default sector start // small disk needs more space for grub2 mbr sector   #4. 2= default sector start // small disk needs more space for grub2 mbr sector
    513   #5. ''= defaul sector end   #5. ''= defaul sector end
    514   #6. a= bootable flag   #6. a= bootable flag
    515   #7. 1= boot flag for partition 1   #7. 1= boot flag for partition 1
    516   #8. w= write/quit   #8. w= write/quit
    517   fdisk ${HDD} &> /dev/null << EOF   fdisk ${HDD} &> /dev/null << EOF
    518  n  n
    519  p  p
    520  1  1
    # Line 577  a Line 524  a
    524  1  1
    525  w  w
    526  EOF  EOF
    527   else   else
    528   ## setup one bootable partition   ## setup one bootable partition
    529   #1. n= new disk   #1. n= new disk
    530   #2. p= primary disk   #2. p= primary disk
    531   #3. 1= first partition   #3. 1= first partition
    532   #4. ''= default sector start   #4. ''= default sector start
    533   #5. ''= defaul sector end   #5. ''= defaul sector end
    534   #6. a= bootable flag   #6. a= bootable flag
    535   #7. 1= boot flag for partition 1   #7. 1= boot flag for partition 1
    536   #8. w= write/quit   #8. w= write/quit
    537   fdisk ${HDD} &> /dev/null << EOF   fdisk ${HDD} &> /dev/null << EOF
    538  n  n
    539  p  p
    540  1  1
    # Line 597  a Line 544  a
    544  1  1
    545  w  w
    546  EOF  EOF
    547     fi
    548     else
    549     ## hdds partitionieren manuell
    550     cfdisk ${HDD} || die
    551   fi   fi
    552  }  }
    553    
     setup_hdd_partitions_manuell()  
     {  
      case "${INSTALL_METHOD}" in  
      normal)  
      BOOTHDD="${HDD}1"  
      SWAPHDD="${HDD}2"  
      ROOTHDD="${HDD}3"  
      ;;  
       
      single|auto)  
      ROOTHDD="${HDD}1"  
      ;;  
      esac  
       
      ## hdds partitionieren manuell  
      cfdisk ${HDD} || die  
     }  
       
    554  setup_hdd_format()  setup_hdd_format()
    555  {  {
    556   if [[ -n ${SWAPHDD} ]]   if [[ -n ${SWAPHDD} ]]
    # Line 966  run_install() Line 899  run_install()
    899    
    900   dialog_hardware_detection   dialog_hardware_detection
    901    
    902   case "${INSTALL_METHOD}" in   dialog_setup_hdd_partitions
      auto) dialog_setup_hdd_partitions_auto ;;  
      *) dialog_setup_hdd_partitions_manuell ;;  
      esac  
    903   dialog_setup_hdd_format   dialog_setup_hdd_format
    904   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
    905   install_mount_rootfs   install_mount_rootfs
    Legend:
    Removed from v.6825  
    changed lines
      Added in v.6826