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 6828 by niro, Thu Jul 23 11:39:57 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 ]]   BOOTHDD=""
    487     SWAPHDD=""
    488     ROOTHDD="${HDD}1"
    489     ;;
    490     esac
    491    
    492     if [[ ${INSTALL_METHOD} = auto ]]
    493   then   then
    494   if hdd_size_below_256mb ${HDD}   # run this only if FDISKPARTITIONBELOW256MB is not already 1
    495     if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
    496   then   then
    497   FDISKPARTIONBELOW256MB=1   if hdd_size_below_256mb ${HDD}
    498   else   then
    499   FDISKPARTIONBELOW256MB=0   FDISKPARTIONBELOW256MB=1
    500     else
    501     FDISKPARTIONBELOW256MB=0
    502     fi
    503   fi   fi
      fi  
    504    
    505   ## delete disk   ## delete disk
    506   dd if=/dev/zero of=${HDD} count=1 &> /dev/null || die   dd if=/dev/zero of=${HDD} count=1 &> /dev/null || die
    507    
    508   if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]   if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]
    509   then   then
    510   ## setup one bootable partition   ## setup one bootable partition
    511   #1. n= new disk   #1. n= new disk
    512   #2. p= primary disk   #2. p= primary disk
    513   #3. 1= first partition   #3. 1= first partition
    514   #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
    515   #5. ''= defaul sector end   #5. ''= defaul sector end
    516   #6. a= bootable flag   #6. a= bootable flag
    517   #7. 1= boot flag for partition 1   #7. 1= boot flag for partition 1
    518   #8. w= write/quit   #8. w= write/quit
    519   fdisk ${HDD} &> /dev/null << EOF   fdisk ${HDD} &> /dev/null << EOF
    520  n  n
    521  p  p
    522  1  1
    # Line 577  a Line 526  a
    526  1  1
    527  w  w
    528  EOF  EOF
    529   else   else
    530   ## setup one bootable partition   ## setup one bootable partition
    531   #1. n= new disk   #1. n= new disk
    532   #2. p= primary disk   #2. p= primary disk
    533   #3. 1= first partition   #3. 1= first partition
    534   #4. ''= default sector start   #4. ''= default sector start
    535   #5. ''= defaul sector end   #5. ''= defaul sector end
    536   #6. a= bootable flag   #6. a= bootable flag
    537   #7. 1= boot flag for partition 1   #7. 1= boot flag for partition 1
    538   #8. w= write/quit   #8. w= write/quit
    539   fdisk ${HDD} &> /dev/null << EOF   fdisk ${HDD} &> /dev/null << EOF
    540  n  n
    541  p  p
    542  1  1
    # Line 597  a Line 546  a
    546  1  1
    547  w  w
    548  EOF  EOF
    549     fi
    550     else
    551     ## hdds partitionieren manuell
    552     cfdisk ${HDD} || die
    553   fi   fi
    554  }  }
    555    
     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  
     }  
       
    556  setup_hdd_format()  setup_hdd_format()
    557  {  {
    558   if [[ -n ${SWAPHDD} ]]   if [[ -n ${SWAPHDD} ]]
    # Line 626  setup_hdd_format() Line 561  setup_hdd_format()
    561   fi   fi
    562   if [[ -n ${BOOTHDD} ]]   if [[ -n ${BOOTHDD} ]]
    563   then   then
    564   mke2fs -j -q ${BOOTHDD} || die   mkfs.${FORMAT_FILESYSTEM} -q ${BOOTHDD} || die
    565   fi   fi
    566   if [[ -n ${ROOTHDD} ]]   if [[ -n ${ROOTHDD} ]]
    567   then   then
    568   mke2fs -j -q ${ROOTHDD} || die   mkfs.${FORMAT_FILESYSTEM} -q ${ROOTHDD} || die
    569   fi   fi
    570  }  }
    571    
    # Line 966  run_install() Line 901  run_install()
    901    
    902   dialog_hardware_detection   dialog_hardware_detection
    903    
    904   case "${INSTALL_METHOD}" in   dialog_setup_hdd_partitions
      auto) dialog_setup_hdd_partitions_auto ;;  
      *) dialog_setup_hdd_partitions_manuell ;;  
      esac  
    905   dialog_setup_hdd_format   dialog_setup_hdd_format
    906   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
    907   install_mount_rootfs   install_mount_rootfs
    Legend:
    Removed from v.6825  
    changed lines
      Added in v.6828