summaryrefslogtreecommitdiff
path: root/src/core/procedures/base
diff options
context:
space:
mode:
authorDieter Plaetinck <dieter@plaetinck.be>2010-12-29 17:34:46 +0100
committerDieter Plaetinck <dieter@plaetinck.be>2010-12-29 17:34:46 +0100
commitdb638937e81daf4ba01efa81d9fd0cbeb053fcc2 (patch)
treef002a31a803a5c794ef6a6ef401327b973f0b0f9 /src/core/procedures/base
parentae36bcc5786faf625ca56b28a2f6d738f01d2ddb (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/base')
-rw-r--r--src/core/procedures/base15
1 files changed, 1 insertions, 14 deletions
diff --git a/src/core/procedures/base b/src/core/procedures/base
index a7cd382..e2d470d 100644
--- a/src/core/procedures/base
+++ b/src/core/procedures/base
@@ -28,8 +28,6 @@ phase_basics=(\
phase_system=(\
package_list \
install_packages \
- auto_locale \
- auto_keymap_font \
configure_system \
mkinitcpio \
locales \
@@ -157,20 +155,9 @@ worker_auto_network ()
}
-worker_auto_locale ()
-{
- target_configure_initial_locale
-}
-
-
-worker_auto_keymap_font ()
-{
- target_configure_initial_keymap_font
-}
-
worker_configure_system ()
{
- true
+ preconfigure_target
}