diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2008-11-12 16:15:49 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2008-11-12 16:15:49 +0100 |
| commit | f83c2500a07ad79517b88897b3d1d5b7d4c5f122 (patch) | |
| tree | 33b89f4739fbb02488c316b473a33eac0c5da756 | |
| parent | fbbe59dd8f569084ffb63430d5c6bee7b113cac0 (diff) | |
properly check runtime_network before auto_network
| -rw-r--r-- | src/core/procedures/interactive | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive index d1b4d7c..df164c8 100644 --- a/src/core/procedures/interactive +++ b/src/core/procedures/interactive @@ -83,24 +83,24 @@ mainmenu() [ "$ANSWER_OPTION" = 2 ] && break done fi - [ $ret -eq 0 ] && execute worker runtime_packages && NEXTITEM=1 ;; + [ $ret -eq 0 ] && execute worker runtime_packages && NEXTITEM=1 ;; "1") - execute worker set_clock && NEXTITEM=2 ;; + execute worker set_clock && NEXTITEM=2 ;; "2") - execute worker prepare_disks && NEXTITEM=3 ;; + execute worker prepare_disks && NEXTITEM=3 ;; "3") - check_depend worker prepare_disks && execute worker package_list && NEXTITEM=4 ;; + check_depend worker prepare_disks && execute worker package_list && NEXTITEM=4 ;; "4") check_depend worker package_list && \ - check_depend select_source && execute worker install_packages && { execute worker auto_fstab ; \ - ended_ok runtime_network && execute worker auto_network ; \ - execute worker auto_locale ; } && NEXTITEM=5 ;; + check_depend select_source && execute worker install_packages && { execute worker auto_fstab ; \ + ended_ok worker runtime_network && execute worker auto_network ; \ + execute worker auto_locale ; } && NEXTITEM=5 ;; "5") - check_depend worker install_packages && execute worker configure_system && { execute worker mkinitcpio ; \ - execute worker locales ; } && NEXTITEM=6 ;; #TODO: why is next item 4 if $?=0?. maybe fixed now + check_depend worker install_packages && execute worker configure_system && { execute worker mkinitcpio ; \ + execute worker locales ; } && NEXTITEM=6 ;; #TODO: why is next item 4 if $?=0?. maybe fixed now "6") - check_depend worker configure_system && execute worker install_bootloader && NEXTITEM=7 ;; + check_depend worker configure_system && execute worker install_bootloader && NEXTITEM=7 ;; "7") notify "If the install finished successfully, you can now type 'reboot' to restart the system." && stop_installer ;; *) |