diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2010-12-29 17:34:46 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2010-12-29 17:34:46 +0100 |
| commit | db638937e81daf4ba01efa81d9fd0cbeb053fcc2 (patch) | |
| tree | f002a31a803a5c794ef6a6ef401327b973f0b0f9 /src/core/procedures/interactive | |
| parent | ae36bcc5786faf625ca56b28a2f6d738f01d2ddb (diff) | |
Make locale generation and keymap/font setting part of system configuration
* remove auto_locale and auto_keymap_font workers, no need for middle-man.
* call relevant code directly from prefill_configs, which is now renamed to
preconfigure_target
* make base procedure run preconfigure_target in configure_system worker.
(this also removes the need for the configure_system worker definition
in the automatic procedure)
* warn user in interactive_configure_system() when preconfigure_target()
failed, and allow him to go back
* simplify interactive worker_install_packages () a little bit
Diffstat (limited to 'src/core/procedures/interactive')
| -rw-r--r-- | src/core/procedures/interactive | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/core/procedures/interactive b/src/core/procedures/interactive index 448a273..3318aeb 100644 --- a/src/core/procedures/interactive +++ b/src/core/procedures/interactive @@ -72,9 +72,7 @@ mainmenu() check_depend worker select_source && execute worker package_list && default=6 ;; "6") check_depend worker package_list && \ - check_depend worker select_source && execute worker install_packages && { execute worker auto_locale ; \ - execute worker auto_keymap_font; - true ; } && default=7 ;; + 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 ; @@ -165,8 +163,7 @@ worker_package_list() { worker_install_packages () { - installpkg && return 0 - return 1 + installpkg } |