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 2476 by niro, Wed Jan 8 09:15:14 2014 UTC revision 2479 by niro, Wed Jan 8 10:24:48 2014 UTC
    # Line 172  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 193  dialog_setup_hdd_partitions_manual() Line 193  dialog_setup_hdd_partitions_manual()
    193   fi   fi
    194  }  }
    195    
    196  dialog_setup_hdd_partitions_auto()  task_setup_hdd_partitions_auto()
    197  {  {
    198   local i   local i
    199   local retval   local retval
    # Line 228  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 ]]
    # Line 643  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 671  run_install_auto() Line 667  run_install_auto()
    667  {  {
    668   dialog_hardware_detection   dialog_hardware_detection
    669    
    670   dialog_setup_hdd_partitions_auto   task_setup_hdd_partitions_auto
    671   dialog_setup_hdd_format   dialog_setup_hdd_format
    672   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
    673   install_mount_rootfs   install_mount_rootfs
    # Line 698  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.2476  
    changed lines
      Added in v.2479