git-svn-id: http://phraktured.net/archiso@13 00a9fe69-e71b-0410-bb23-df0e5024db41

6 files changed, 27 insertions, 51 deletions

diff --git a/default-config/etc/archiso/functions b/default-config/etc/archiso/functions
index 2972013..d668b4c 100644
--- a/default-config/etc/archiso/functions
+++ b/default-config/etc/archiso/functions
@@ -1,11 +1,13 @@
-# vim: set ft=sh:

-cmdline_param ()

-{

-    while param do;

-        case "${param}" in

-            $1=*) echo "${param##*=}"; break ;;

-            *) continue ;;

-        esac

-        echo "${2}"

-    done < read /proc/cmdline

-}

+# vim: set ft=sh:
+
+cmdline_param ()
+{
+    read cmdline < /proc/cmdline
+    for param in ${cmdline}; do
+        case "${param}" in
+            $1=*) echo "${param##*=}"; break ;;
+            *) continue ;;
+        esac
+    done
+    [ -n "${2}" ] && echo "${2}"
+}
diff --git a/default-config/etc/inittab b/default-config/etc/inittab
deleted file mode 100644
index c9ffeea..0000000
--- a/default-config/etc/inittab
+++ /dev/null
@@ -1,17 +0,0 @@
-# runlevel 4 is typically "text mode", but is not specified in LSB
-id:4:initdefault:
-
-rc::sysinit:/etc/rc.sysinit-proxy
-rs:S1:wait:/etc/rc.single
-rm:2345:wait:/etc/rc.multi
-rh:06:wait:/etc/rc.shutdown
-su:S:wait:/sbin/sulogin -p
-
-c1:2345:respawn:/sbin/agetty 38400 vc/1 linux
-c2:2345:respawn:/sbin/agetty 38400 vc/2 linux
-c3:2345:respawn:/sbin/agetty 38400 vc/3 linux
-c4:2345:respawn:/sbin/agetty 38400 vc/4 linux
-c5:2345:respawn:/sbin/agetty 38400 vc/5 linux
-c6:2345:respawn:/sbin/agetty 38400 vc/6 linux
-
-ca::ctrlaltdel:/sbin/shutdown -t3 -r now
diff --git a/default-config/etc/issue b/default-config/etc/issue
index 9f3773c..3abbcf5 100644
--- a/default-config/etc/issue
+++ b/default-config/etc/issue
@@ -1,3 +1,4 @@
+
 Arch Linux Live ISO 0.1 (Snicklefritz) \n [\s \m \r] (\n)
-Started at \b \t
+\s-\r \v \m started at \d \t
 Default login is "arch" with no password.
diff --git a/default-config/etc/passwd b/default-config/etc/passwd
index 6f69ed0..fc64eab 100644
--- a/default-config/etc/passwd
+++ b/default-config/etc/passwd
@@ -4,4 +4,4 @@ daemon:x:2:2:daemon:/sbin:
 mail:x:8:12:mail:/var/spool/mail:

 ftp:x:14:11:ftp:/home/ftp:

 nobody:x:99:99:nobody:/:

-arch::1000:100::/home/arch:/bin/bash

+arch::1000:100:users:/home/arch:/bin/bash

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"
diff --git a/default-config/etc/rc.sysinit-proxy b/default-config/etc/rc.sysinit-proxy
deleted file mode 100644
index f47156e..0000000
--- a/default-config/etc/rc.sysinit-proxy
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash

-# we need a proxy script here to convert some /proc/cmdline

-# parameters to rc.conf settings.

-

-. /etc/archlive/functions

-

-LOCALE_DEFAULT="en_US.UTF-8"

-TIMEZONE_DEFAULT="America/Chicago"

-KEYMAP_DEFAULT="us"

-

-sed -i "s|##LOCALE##|$(cmdline_param locale ${LOCALE_DEFAULT})|" /etc/rc.conf

-sed -i "s|##TIMEZONE##|$(cmdline_param timezone ${TIMEZONE_DEFAULT})|" /etc/rc.conf

-sed -i "s|##KEYMAP##|$(cmdline_param keymap ${KEYMAP_DEFAULT})|" /etc/rc.conf

-

-#now go to the real sysinit

-exec /etc/rc.sysinit