Magellan Linux

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

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

revision 2936 by niro, Wed Feb 3 11:00:35 2016 UTC revision 2937 by niro, Wed Feb 3 13:57:02 2016 UTC
# Line 622  task_hardware_detection() Line 622  task_hardware_detection()
622   messagebox -y 12 -h $"Detected hardware:" "${message}"   messagebox -y 12 -h $"Detected hardware:" "${message}"
623  }  }
624    
625    task_select_target_hdd()
626    {
627     if [[ -z ${ALL_DISKS} ]]
628     then
629     dialog_no_harddrive_found
630     exit 1
631     else
632     export HDD=$(dialog_select_target_harddrive)
633     fi
634    }
635    
636  task_setup_hdd_partitions()  task_setup_hdd_partitions()
637  {  {
  local i  
638   local retval   local retval
639    
640   if [[ -z ${ALL_DISKS} ]]   if [[ -z ${HDD} ]]
641   then   then
642   dialog_no_harddrive_found   dialog_no_harddrive_found
643   exit 1   exit 1
644   else   else
645   HDD=$(dialog_select_target_harddrive)   dialog_setup_hdd_info
646   retval=$?   setup_hdd_partitions
  [[ ${retval} -eq 1 ]] && return 1  
  if [[ ${retval} -eq 0 ]]  
  then  
  dialog_setup_hdd_info  
  setup_hdd_partitions  
  fi  
647   fi   fi
648  }  }
649    
# Line 670  run_install() Line 674  run_install()
674   local method="$1"   local method="$1"
675    
676   task_hardware_detection   task_hardware_detection
677     task_select_target_hdd
678    
679   case "${method}" in   case "${method}" in
680   auto)   auto)

Legend:
Removed from v.2936  
changed lines
  Added in v.2937