From c464db595165a847e5fc81a57133f68a9c2e0ef8 Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaron@archlinux.org>
Date: Thu, 28 Sep 2006 02:15:25 +0000
Subject: git-svn-id: http://phraktured.net/archiso@13
 00a9fe69-e71b-0410-bb23-df0e5024db41

---
 default-config/etc/rc.conf | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'default-config/etc/rc.conf')

diff --git a/default-config/etc/rc.conf b/default-config/etc/rc.conf
index 1b8b9c9..ed069e4 100644
--- a/default-config/etc/rc.conf
+++ b/default-config/etc/rc.conf
@@ -1,12 +1,18 @@
 #
 # /etc/rc.conf - Main Configuration for Arch Linux
 
-LOCALE="##LOCALE##"
+. /etc/archiso/functions
+
+LOCALE_DEFAULT="en_US.UTF-8"
+TIMEZONE_DEFAULT="America/Chicago"
+KEYMAP_DEFAULT="us"
+
+LOCALE="$(cmdline_param locale ${LOCALE_DEFAULT})"
 HARDWARECLOCK="UTC"
-TIMEZONE="##TIMEZONE##"
-KEYMAP="##KEYMAP##"
-CONSOLEFONT=""
-CONSOLEMAP=""
+TIMEZONE="$(cmdline_param timezone ${TIMEZONE_DEFAULT})"
+KEYMAP="$(cmdline_param keymap ${KEYMAP_DEFAULT})"
+CONSOLEFONT="$(cmdline_param consolefont)"
+CONSOLEMAP="$(cmdline_param consolefont)"
 USECOLOR="yes"
 
 MOD_AUTOLOAD="yes"
-- 
cgit v1.2.3-70-g09d2