--- trunk/installer-simple/bin/installer.sh.in 2014/01/08 08:55:40 2474 +++ trunk/installer-simple/bin/installer.sh.in 2014/01/08 09:15:14 2476 @@ -110,16 +110,12 @@ fi } -dialog_setup_system_menu() +task_setup_system_menu() { local mode local retval - mode=$(menubox -h $"[ Harddrive partitioning ]" $"\nSelect an installation mode" \ - $"1:Automatic setup (recommended)" \ - ":" \ - $":\Z1Expert modes:\Zn" \ - $"2:Common IDE-disk (manual setup)") + mode="$(dialog_setup_system_menu)" retval=$? [[ ${retval} -eq 1 ]] && return 1 if [[ ${retval} -eq 0 ]] @@ -127,7 +123,7 @@ case "${mode}" in "1") run_install_auto ;; "2") run_install_normal ;; - "") dialog_setup_system_menu;; + "") task_setup_system_menu;; esac fi } @@ -249,7 +245,7 @@ if [[ ${retval} -eq 0 ]] then case ${method} in - "1") dialog_setup_system_menu ;; + "1") task_setup_system_menu ;; "2") dialog_hardware_detection ;; "3") install_do_reboot ;; "4") /bin/bash --login -i ;; @@ -334,24 +330,6 @@ export ALL_CDROMS="$(get_hwinfo cdrom)" } -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}" -} - setup_hdd_partitions_auto() { ROOTHDD="${HDD}1"