diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2010-12-29 18:08:49 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2010-12-29 18:08:49 +0100 |
| commit | 846471086b3c581619eeda5ad706475a1a17ddf9 (patch) | |
| tree | 6eea91278f4ac1a2eea7c3d826ab3a8214bb49cc /src/core/procedures | |
| parent | d363589e1a55874d3eb9abade701d61ea1f085b7 (diff) | |
refactor locale, initcpio and initialtime code
* remove locale, initcpio and initialtime workers, move logic in new
postconfigure_target function
* for base and automatic procedures, postconfigure_target() gets called
automatically
* interactive procedure calls this in interactive_configure_system in the
same way it calls preconfigure_target
* rename target_run_mkinitcpio to target_run_mkinitcpio, to be consistent
with other functions
Diffstat (limited to 'src/core/procedures')
| -rw-r--r-- | src/core/procedures/automatic | 2 | ||||
| -rw-r--r-- | src/core/procedures/base | 21 | ||||
| -rw-r--r-- | src/core/procedures/interactive | 5 |
3 files changed, 3 insertions, 25 deletions
diff --git a/src/core/procedures/automatic b/src/core/procedures/automatic index a61468a..ba533fa 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 configure_system mkinitcpio locales install_bootloader) +# phase_system=(package_list install_packages configure_system 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 e2d470d..68a91ee 100644 --- a/src/core/procedures/base +++ b/src/core/procedures/base @@ -29,8 +29,6 @@ phase_system=(\ package_list \ install_packages \ configure_system \ - mkinitcpio \ - locales \ install_bootloader) phase_finish=(msg_report) @@ -158,24 +156,7 @@ worker_auto_network () worker_configure_system () { preconfigure_target -} - - -worker_mkinitcpio () -{ - run_mkinitcpio -} - - -worker_locales () -{ - target_locale-gen -} - - -worker_initialtime () -{ - cp /etc/localtime ${var_TARGET_DIR}/etc/localtime + postconfigure_target } diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive index 77e17a4..bac495c 100644 --- a/src/core/procedures/interactive +++ b/src/core/procedures/interactive @@ -74,10 +74,7 @@ mainmenu() check_depend worker package_list && \ check_depend worker select_source && execute worker install_packages && default=7 ;; "7") - check_depend worker install_packages && execute worker configure_system && { execute worker mkinitcpio ; \ - execute worker locales ; - execute worker initialtime ; - true ; } && default=8 ;; + check_depend worker install_packages && execute worker configure_system && default=8 ;; "8") check_depend worker configure_system && execute worker install_bootloader && default=9 ;; "9") |