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/automatic | |
| 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/automatic')
| -rw-r--r-- | src/core/procedures/automatic | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/core/procedures/automatic b/src/core/procedures/automatic index 4fba65b..a61468a 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_locale auto_keymap_font configure_system mkinitcpio locales install_bootloader) +# phase_system=(package_list install_packages 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 @@ -14,7 +14,7 @@ # TODO: implement setting hostname, keymap, consolefont, network settings, root pass, etc # for a list of recognized variables, see examples/generic-install-on-sda -depend_procedure core base +depend_procedure core base # important, don't be confused when worker/variable definitions seem to be missing here. var_OPTS_STRING="c:" var_ARGS_USAGE="-c <config>: Specify a configfile (profile) to be used" @@ -108,10 +108,6 @@ worker_set_clock () } -worker_configure_system () { - prefill_configs -} - worker_install_bootloader () { get_grub_map |