From 6491e409a93d6a07f7d6f0888697c524487bc643 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Tue, 31 Jul 2012 19:52:09 -0300
Subject: Adjust rc.conf for recent initscripts changes

* We use a rc.conf file loser to the upstream default.
* Use the recommend config files to setup hostname, locale, timezone and console

EDIT (Gerardo): Add empty FONT= and use ln -f for localtime

Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
---
 configs/releng/build.sh                            |  1 +
 configs/releng/root-image/etc/hostname             |  1 +
 configs/releng/root-image/etc/locale.conf          |  1 +
 configs/releng/root-image/etc/rc.conf              | 48 +++++++++-------------
 .../etc/rc.d/functions.d/prepare_locale_gen        | 11 -----
 configs/releng/root-image/etc/timezone             |  1 +
 configs/releng/root-image/etc/vconsole.conf        |  2 +
 7 files changed, 25 insertions(+), 40 deletions(-)
 create mode 100644 configs/releng/root-image/etc/hostname
 create mode 100644 configs/releng/root-image/etc/locale.conf
 delete mode 100644 configs/releng/root-image/etc/rc.d/functions.d/prepare_locale_gen
 create mode 100644 configs/releng/root-image/etc/timezone
 create mode 100644 configs/releng/root-image/etc/vconsole.conf

(limited to 'configs')

diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 1dbf4ba..ea081d9 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -142,6 +142,7 @@ make_customize_root_image() {
     if [[ ! -e ${work_dir}/build.${FUNCNAME} ]]; then
         cp -af ${script_path}/root-image ${work_dir}
         cp -aT ${work_dir}/root-image/etc/skel/ ${work_dir}/root-image/root/
+        ln -sf /usr/share/zoneinfo/UTC ${work_dir}/root-image/etc/localtime
         chmod 750 ${work_dir}/root-image/etc/sudoers.d
         chmod 440 ${work_dir}/root-image/etc/sudoers.d/g_wheel
         mkdir -p ${work_dir}/root-image/etc/pacman.d
diff --git a/configs/releng/root-image/etc/hostname b/configs/releng/root-image/etc/hostname
new file mode 100644
index 0000000..2dbe21e
--- /dev/null
+++ b/configs/releng/root-image/etc/hostname
@@ -0,0 +1 @@
+archiso
diff --git a/configs/releng/root-image/etc/locale.conf b/configs/releng/root-image/etc/locale.conf
new file mode 100644
index 0000000..01ec548
--- /dev/null
+++ b/configs/releng/root-image/etc/locale.conf
@@ -0,0 +1 @@
+LANG=en_US.UTF-8
diff --git a/configs/releng/root-image/etc/rc.conf b/configs/releng/root-image/etc/rc.conf
index d8dedec..f97ec88 100644
--- a/configs/releng/root-image/etc/rc.conf
+++ b/configs/releng/root-image/etc/rc.conf
@@ -1,33 +1,23 @@
-#
-# /etc/rc.conf - Main Configuration for Arch Linux
-
 . /etc/archiso/functions
+#
+# /etc/rc.conf - configuration file for initscripts
+#
+# Most of rc.conf has been replaced by various other configuration
+# files. See archlinux(7) for details.
+#
+# For more details on rc.conf see rc.conf(5).
+#
 
-LOCALE_DEFAULT="en_US.UTF-8"
-DAEMON_LOCALE_DEFAULT="no"
-CLOCK_DEFAULT="UTC"
-TIMEZONE_DEFAULT="UTC"
-KEYMAP_DEFAULT="us"
-CONSOLEFONT_DEFAULT=
-CONSOLEMAP_DEFAULT=
-USECOLOR_DEFAULT="yes"
-
-LOCALE="$(kernel_cmdline locale ${LOCALE_DEFAULT})"
-DAEMON_LOCALE="$(kernel_cmdline daemon_locale ${DAEMON_LOCALE_DEFAULT})"
-HARDWARECLOCK="$(kernel_cmdline clock ${CLOCK_DEFAULT})"
-TIMEZONE="$(kernel_cmdline timezone ${TIMEZONE_DEFAULT})"
-KEYMAP="$(kernel_cmdline keymap ${KEYMAP_DEFAULT})"
-CONSOLEFONT="$(kernel_cmdline consolefont ${CONSOLEFONT_DEFAULT})"
-CONSOLEMAP="$(kernel_cmdline consolemap ${CONSOLEMAP_DEFAULT})"
-USECOLOR="$(kernel_cmdline usecolor ${USECOLOR_DEFAULT})"
-
-MODULES=()
-
-UDEV_TIMEOUT=30
-USEDMRAID="no"
-USEBTRFS="no"
-USELVM="no"
+DAEMONS=(syslog-ng haveged pacman-init)
 
-HOSTNAME="archiso"
+# Storage
+#
+# USEDMRAID="no"
+# USELVM="no"
 
-DAEMONS=(hwclock syslog-ng haveged pacman-init)
+# Network
+#
+# interface=
+# address=
+# netmask=
+# gateway=
diff --git a/configs/releng/root-image/etc/rc.d/functions.d/prepare_locale_gen b/configs/releng/root-image/etc/rc.d/functions.d/prepare_locale_gen
deleted file mode 100644
index 47ed79d..0000000
--- a/configs/releng/root-image/etc/rc.d/functions.d/prepare_locale_gen
+++ /dev/null
@@ -1,11 +0,0 @@
-prepare_locale_gen ()
-{
-    if [[ ${LOCALE} != "en_US.UTF-8" ]]; then
-        stat_busy "Generating locales..."
-            sed -i "s/#\(${LOCALE/[@.]*}\)/\1/" /etc/locale.gen
-            /usr/sbin/locale-gen > /dev/null
-        stat_done
-    fi
-}
-
-add_hook sysinit_postmount prepare_locale_gen
diff --git a/configs/releng/root-image/etc/timezone b/configs/releng/root-image/etc/timezone
new file mode 100644
index 0000000..e2e7775
--- /dev/null
+++ b/configs/releng/root-image/etc/timezone
@@ -0,0 +1 @@
+UTC
diff --git a/configs/releng/root-image/etc/vconsole.conf b/configs/releng/root-image/etc/vconsole.conf
new file mode 100644
index 0000000..c58bf7e
--- /dev/null
+++ b/configs/releng/root-image/etc/vconsole.conf
@@ -0,0 +1,2 @@
+KEYMAP=us
+FONT=
-- 
cgit v1.2.3-70-g09d2