diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2010-12-28 17:00:39 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2010-12-28 17:00:39 +0100 |
| commit | 169ae4f53306aa3c851dcdafb6cc07ccb1cfb514 (patch) | |
| tree | 57121fdf44be473a2923a289807aaccf74cfc69a | |
| parent | a0b47a59004afd9b1493d8f9ac098fe73519bfe8 (diff) | |
remove pointless auto_fstab worker
worker_auto_fstab only wrapped around target_configure_fstab.
remove worker_auto_fstab, and call target_configure_fstab from
prefill_configs(), which gets run in the configure_system worker.
This way all procedures still run the logic, but as part of the system
configuration, not as a separate step
| -rw-r--r-- | src/core/libs/lib-ui-interactive.sh | 1 | ||||
| -rw-r--r-- | src/core/procedures/automatic | 2 | ||||
| -rw-r--r-- | src/core/procedures/base | 7 | ||||
| -rw-r--r-- | src/core/procedures/interactive | 3 |
4 files changed, 3 insertions, 10 deletions
diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index c15c3a9..56e690b 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -18,6 +18,7 @@ check_depend () prefill_configs () { #TODO: only need to do this once. check 'ended_ok worker configure_system' is not good because this could be done already even if worker did not exit 0 + target_configure_fstab || return $? # /etc/pacman.d/mirrorlist # add installer-selected mirror to the top of the mirrorlist if [ "$var_PKG_SOURCE_TYPE" = "net" -a -n "${var_SYNC_URL}" ]; then diff --git a/src/core/procedures/automatic b/src/core/procedures/automatic index 6aa69b9..5f6f336 100644 --- a/src/core/procedures/automatic +++ b/src/core/procedures/automatic @@ -6,7 +6,7 @@ # It should be: # phase_preparation=(configure intro sysprep select_source runtime_network runtime_repositories runtime_packages) # phase_basics=(set_clock prepare_disks) -# phase_system=(package_list install_packages auto_fstab auto_network auto_locale auto_keymap_font configure_system mkinitcpio locales install_bootloader) +# phase_system=(package_list install_packages auto_network auto_locale auto_keymap_font configure_system mkinitcpio locales install_bootloader) # phase_finish=(msg_report) # In theory, the only manual thing should maybe be configuring the runtime network and putting the configfile in place diff --git a/src/core/procedures/base b/src/core/procedures/base index d57a625..fbab6f7 100644 --- a/src/core/procedures/base +++ b/src/core/procedures/base @@ -28,7 +28,6 @@ phase_basics=(\ phase_system=(\ package_list \ install_packages \ - auto_fstab \ auto_network \ auto_locale \ auto_keymap_font \ @@ -158,12 +157,6 @@ worker_install_packages () } -worker_auto_fstab () -{ - target_configure_fstab -} - - worker_auto_network () { [ "$S_DHCP" = 1 ] && target_configure_network dhcp "$PROXY_HTTP" "$PROXY_FTP" && return 0 diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive index bddcdd1..5ee8cd7 100644 --- a/src/core/procedures/interactive +++ b/src/core/procedures/interactive @@ -78,8 +78,7 @@ mainmenu() check_depend worker select_source && execute worker package_list && NEXTITEM=6 ;; "6") check_depend worker package_list && \ - check_depend worker select_source && execute worker install_packages && { execute worker auto_fstab ; \ - execute worker auto_locale ; \ + check_depend worker select_source && execute worker install_packages && { execute worker auto_locale ; \ execute worker auto_keymap_font; true ; } && NEXTITEM=7 ;; "7") |