--- trunk/installer-simple/bin/installer.sh.in 2014/01/07 13:31:50 2411 +++ trunk/installer-simple/bin/installer.sh.in 2014/01/07 13:35:15 2413 @@ -124,9 +124,10 @@ dialog_setup_system_menu() { - local i + local mode + local retval - i=$(dialog \ + mode=$(dialog \ --backtitle "${TITLE}" \ --title "[ Festplatten Partitionierung ]" \ --cancel-label "Abbrechen" \ @@ -138,9 +139,9 @@ "" "" \ "" "\Z1Experten Modi:\Zn" \ "2" "Normale IDE-Disk (Manuell)" \ - RES=$? - [[ ${RES} -eq 1 ]] && return 1 - if [[ ${RES} -eq 0 ]] + retval=$? + [[ ${retval} -eq 1 ]] && return 1 + if [[ ${retval} -eq 0 ]] then case "${i}" in "1") run_install_auto ;; @@ -214,7 +215,7 @@ fi } -dialog_setup_hdd_partitions_manuell() +dialog_setup_hdd_partitions_manual() { local i @@ -247,7 +248,7 @@ if [[ ${RES} -eq 0 ]] then dialog_setup_hdd_info - setup_hdd_partitions_manuell + setup_hdd_partitions_manual fi fi } @@ -543,11 +544,11 @@ fi } -setup_hdd_partitions_manuell() +setup_hdd_partitions_manual() { ROOTHDD="${HDD}1" - ## hdds partitionieren manuell + ## hdds partitionieren manual cfdisk ${HDD} || dialog_die } @@ -824,7 +825,7 @@ { dialog_hardware_detection - dialog_setup_hdd_partitions_manuell + dialog_setup_hdd_partitions_manual dialog_setup_hdd_format setup_hdd_format > /dev/null install_mount_rootfs