Magellan Linux

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

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

revision 2412 by niro, Tue Jan 7 13:33:46 2014 UTC revision 2414 by niro, Tue Jan 7 13:36:09 2014 UTC
# Line 143  dialog_setup_system_menu() Line 143  dialog_setup_system_menu()
143   [[ ${retval} -eq 1 ]] && return 1   [[ ${retval} -eq 1 ]] && return 1
144   if [[ ${retval} -eq 0 ]]   if [[ ${retval} -eq 0 ]]
145   then   then
146   case "${i}" in   case "${menu}" in
147   "1") run_install_auto ;;   "1") run_install_auto ;;
148   "2") run_install_normal ;;   "2") run_install_normal ;;
149   "") dialog_setup_system_menu;;   "") dialog_setup_system_menu;;
# Line 215  dialog_hardware_detection() Line 215  dialog_hardware_detection()
215   fi   fi
216  }  }
217    
218  dialog_setup_hdd_partitions_manuell()  dialog_setup_hdd_partitions_manual()
219  {  {
220   local i   local i
221    
# Line 248  dialog_setup_hdd_partitions_manuell() Line 248  dialog_setup_hdd_partitions_manuell()
248   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
249   then   then
250   dialog_setup_hdd_info   dialog_setup_hdd_info
251   setup_hdd_partitions_manuell   setup_hdd_partitions_manual
252   fi   fi
253   fi   fi
254  }  }
# Line 544  EOF Line 544  EOF
544   fi   fi
545  }  }
546    
547  setup_hdd_partitions_manuell()  setup_hdd_partitions_manual()
548  {  {
549   ROOTHDD="${HDD}1"   ROOTHDD="${HDD}1"
550    
551   ## hdds partitionieren manuell   ## hdds partitionieren manual
552   cfdisk ${HDD} || dialog_die   cfdisk ${HDD} || dialog_die
553  }  }
554    
# Line 825  run_install_normal() Line 825  run_install_normal()
825  {  {
826   dialog_hardware_detection   dialog_hardware_detection
827    
828   dialog_setup_hdd_partitions_manuell   dialog_setup_hdd_partitions_manual
829   dialog_setup_hdd_format   dialog_setup_hdd_format
830   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
831   install_mount_rootfs   install_mount_rootfs

Legend:
Removed from v.2412  
changed lines
  Added in v.2414