Magellan Linux

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

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

revision 2473 by niro, Wed Jan 8 08:53:38 2014 UTC revision 2478 by niro, Wed Jan 8 10:22:46 2014 UTC
# Line 110  dialog_warning() Line 110  dialog_warning()
110   fi   fi
111  }  }
112    
113  dialog_setup_hdd_info()  task_setup_system_menu()
 {  
  local drivenode="${HDD//\/dev\/}"  
   
  messagebox -h $"[ Harddrive partitioning ]" \  
  $"Please create 1 partition.\n\n[ \Z3${drivenode}1\Zn ] type: \Z3linux\Zn with the whole diskspace.\nPlease mark ${SHDD}1 \Z3bootable\Zn."  
 }  
   
 dialog_setup_hdd_info_auto()  
 {  
  local drivenode="${HDD//\/dev\/}"  
   
  messagebox -h $"[ Harddrive partitioning ]" \  
  $"\Z1Warning!\Zn\n\nAll data on disk [ \Z3${drivenode}\Zn ] will be erased!"  
 }  
   
 dialog_setup_system_menu()  
114  {  {
115   local mode   local mode
116   local retval   local retval
117    
118   mode=$(menubox -h $"[ Harddrive partitioning ]" $"\nSelect an installation mode" \   mode="$(dialog_setup_system_menu)"
  $"1:Automatic setup (recommended)" \  
  ":" \  
  $":\Z1Expert modes:\Zn" \  
  $"2:Common IDE-disk (manual setup)")  
119   retval=$?   retval=$?
120   [[ ${retval} -eq 1 ]] && return 1   [[ ${retval} -eq 1 ]] && return 1
121   if [[ ${retval} -eq 0 ]]   if [[ ${retval} -eq 0 ]]
# Line 143  dialog_setup_system_menu() Line 123  dialog_setup_system_menu()
123   case "${mode}" in   case "${mode}" in
124   "1") run_install_auto ;;   "1") run_install_auto ;;
125   "2") run_install_normal ;;   "2") run_install_normal ;;
126   "") dialog_setup_system_menu;;   "") task_setup_system_menu;;
127   esac   esac
128   fi   fi
129  }  }
# Line 192  dialog_hardware_detection() Line 172  dialog_hardware_detection()
172   messagebox -y 12 -h $"Detected hardware:" "${message}"   messagebox -y 12 -h $"Detected hardware:" "${message}"
173  }  }
174    
175  dialog_setup_hdd_partitions_manual()  task_setup_hdd_partitions_manual()
176  {  {
177   local i   local i
178   local retval   local retval
# Line 248  install_meter() Line 228  install_meter()
228   return 0   return 0
229  }  }
230    
231  dialog_main()  task_main()
232  {  {
233   local method=0   local method=0
234   local retval   local retval
235    
236   while [[ ${method} -le 2 ]]   while [[ ${method} -le 2 ]]
237   do   do
238   method=$(CANCEL_LABEL=$"Exit" menubox $"Configuration:" \   method=$(dialog_main)
  $"1:Install system" \  
  $"2:Show detected harddrives" \  
  $"3:Exit and reboot" \  
  $"4:Exit and drop into a shell")  
239   retval=$?   retval=$?
240   [[ ${retval} -eq 1 ]] && exit 1   [[ ${retval} -eq 1 ]] && exit 1
241   if [[ ${retval} -eq 0 ]]   if [[ ${retval} -eq 0 ]]
242   then   then
243   case ${method} in   case ${method} in
244   "1") dialog_setup_system_menu ;;   "1") task_setup_system_menu ;;
245   "2") dialog_hardware_detection ;;   "2") dialog_hardware_detection ;;
246   "3") install_do_reboot ;;   "3") install_do_reboot ;;
247   "4") /bin/bash --login -i ;;   "4") /bin/bash --login -i ;;
# Line 350  run_hardware_detection_disks() Line 326  run_hardware_detection_disks()
326   export ALL_CDROMS="$(get_hwinfo cdrom)"   export ALL_CDROMS="$(get_hwinfo cdrom)"
327  }  }
328    
 hdd_size_below_256mb()  
 {  
  local hdd="$1"  
  local size  
  local retval  
  [[ -z ${hdd} ]] && dialog_die "Error: get_hdd_size() no \$hdd given!"  
   
  size=$(fdisk -l ${hdd} | grep "Disk.*${hdd}" | sed 's:.*,\ \(.*\)\ byte.*:\1:')  
  if [[ ${size} -le 257000000 ]]  
  then  
  retval="0"  
  else  
  retval="1"  
  fi  
   
  return "${retval}"  
 }  
   
329  setup_hdd_partitions_auto()  setup_hdd_partitions_auto()
330  {  {
331   ROOTHDD="${HDD}1"   ROOTHDD="${HDD}1"
# Line 681  run_install_normal() Line 639  run_install_normal()
639  {  {
640   dialog_hardware_detection   dialog_hardware_detection
641    
642   dialog_setup_hdd_partitions_manual   task_setup_hdd_partitions_manual
643   dialog_setup_hdd_format   dialog_setup_hdd_format
644   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
645   install_mount_rootfs   install_mount_rootfs
# Line 736  run_install_auto() Line 694  run_install_auto()
694  # set some proper traps  # set some proper traps
695  trap "trap_exit" SIGINT SIGQUIT  trap "trap_exit" SIGINT SIGQUIT
696    
697  dialog_main  task_main
698    
699  exit 0  exit 0

Legend:
Removed from v.2473  
changed lines
  Added in v.2478