From db638937e81daf4ba01efa81d9fd0cbeb053fcc2 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Wed, 29 Dec 2010 17:34:46 +0100 Subject: 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 --- examples/fancy-install-on-sda | 2 +- examples/generic-install-on-sda | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'examples') diff --git a/examples/fancy-install-on-sda b/examples/fancy-install-on-sda index 28c5f1b..ec920d4 100644 --- a/examples/fancy-install-on-sda +++ b/examples/fancy-install-on-sda @@ -19,7 +19,7 @@ worker_intro () { } worker_configure_system () { - prefill_configs + preconfigure_target sed -i 's/^HOSTNAME="myhost"/HOSTNAME="arch-fancy-install"/' $var_TARGET_DIR/etc/rc.conf } diff --git a/examples/generic-install-on-sda b/examples/generic-install-on-sda index 473198a..a5b9a2e 100644 --- a/examples/generic-install-on-sda +++ b/examples/generic-install-on-sda @@ -25,7 +25,7 @@ worker_intro () { } worker_configure_system () { - prefill_configs + preconfigure_target sed -i 's/^HOSTNAME="myhost"/HOSTNAME="arch-generic-install"/' $var_TARGET_DIR/etc/rc.conf } -- cgit v1.2.3-54-g00ecf