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

default-config/etc/arch-release

@@ -1 +1 @@
-Arch Linux Live ISO 0.X (Sniklefritz)
+Arch Linux Live ISO 0.1 (Sniklefritz)

default-config/etc/archiso/functions

@@ -0,0 +1,11 @@
+# vim: set ft=sh:
+cmdline_param ()
+{
+    while param do;
+        case "${param}" in
+            $1=*) echo "${param##*=}"; break ;;
+            *) continue ;;
+        esac
+    done < read /proc/cmdline
+    echo "${2}"
+}

default-config/etc/group

@@ -1,7 +1,7 @@
 root::0:root
 bin::1:root,bin,daemon
 daemon::2:root,bin,daemon
-`sys::3:root,bin
+sys::3:root,bin
 adm::4:root,daemon
 tty::5:
 disk::6:root,arch
@@ -16,4 +16,4 @@ audio::92:arch
 optical::93:arch
 nobody::99:
 users::100:arch
-slocate:x:21:
+slocate::21:

default-config/etc/inittab

@@ -1,6 +1,7 @@
+# runlevel 4 is typically "text mode", but is not specified in LSB
 id:4:initdefault:
 
-rc::sysinit:/etc/rc.sysinit
+rc::sysinit:/etc/rc.sysinit-proxy
 rs:S1:wait:/etc/rc.single
 rm:2345:wait:/etc/rc.multi
 rh:06:wait:/etc/rc.shutdown

default-config/etc/issue

@@ -1,2 +1,3 @@
-Arch Linux Live ISO 0.X (Snicklefritz)    (\n) (\l)
+Arch Linux Live ISO 0.1 (Snicklefritz) \n [\s \m \r] (\n)
-Default user: arch
+Started at \b \t
+Default login is "arch" with no password.

default-config/etc/rc.conf

@@ -1,12 +1,12 @@
 #
 # /etc/rc.conf - Main Configuration for Arch Linux
 
-LOCALE="en_US.UTF-8"
+LOCALE="##LOCALE##"
 HARDWARECLOCK="UTC"
-TIMEZONE="America/Chicago"
+TIMEZONE="##TIMEZONE##"
-KEYMAP="us"
+KEYMAP="##KEYMAP##"
-CONSOLEFONT=
+CONSOLEFONT=""
-CONSOLEMAP=
+CONSOLEMAP=""
 USECOLOR="yes"
 
 MOD_AUTOLOAD="yes"

default-config/etc/rc.d/archiso

@@ -1,13 +1,4 @@
 # vim: set ft=sh:
-cmdline_param ()
-{
-    while param do;
-        case "${param}" in
-            $1=*) echo "${param##*=}"; break ;;
-            *) continue ;;
-        esac
-    done < read /proc/cmdline
-}
 . /etc/rc.conf
 . /etc/rc.d/functions
 . /etc/archiso/functions # above goes in this file...

default-config/etc/rc.sysinit-proxy

@@ -0,0 +1,14 @@
+#!/bin/bash
+# we need a proxy script here to convert some /proc/cmdline
+# parameters to rc.conf settings.
+
+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