diff options
Diffstat (limited to 'default-config/etc')
-rw-r--r-- | default-config/etc/arch-release | 2 | ||||
-rw-r--r-- | default-config/etc/archiso/functions | 11 | ||||
-rw-r--r-- | default-config/etc/group | 4 | ||||
-rw-r--r-- | default-config/etc/inittab | 3 | ||||
-rw-r--r-- | default-config/etc/issue | 5 | ||||
-rw-r--r-- | default-config/etc/rc.conf | 10 | ||||
-rw-r--r-- | default-config/etc/rc.d/archiso | 9 | ||||
-rw-r--r-- | default-config/etc/rc.sysinit-proxy | 14 |
8 files changed, 38 insertions, 20 deletions
diff --git a/default-config/etc/arch-release b/default-config/etc/arch-release index 20ba0f6..dd862a2 100644 --- a/default-config/etc/arch-release +++ b/default-config/etc/arch-release @@ -1 +1 @@ -Arch Linux Live ISO 0.X (Sniklefritz) +Arch Linux Live ISO 0.1 (Sniklefritz) diff --git a/default-config/etc/archiso/functions b/default-config/etc/archiso/functions new file mode 100644 index 0000000..bf224dc --- /dev/null +++ b/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}"
+}
diff --git a/default-config/etc/group b/default-config/etc/group index bab2ef8..80a3298 100644 --- a/default-config/etc/group +++ b/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:
diff --git a/default-config/etc/inittab b/default-config/etc/inittab index d222983..c9ffeea 100644 --- a/default-config/etc/inittab +++ b/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 diff --git a/default-config/etc/issue b/default-config/etc/issue index e90c245..9f3773c 100644 --- a/default-config/etc/issue +++ b/default-config/etc/issue @@ -1,2 +1,3 @@ -Arch Linux Live ISO 0.X (Snicklefritz) (\n) (\l) -Default user: arch +Arch Linux Live ISO 0.1 (Snicklefritz) \n [\s \m \r] (\n) +Started at \b \t +Default login is "arch" with no password. diff --git a/default-config/etc/rc.conf b/default-config/etc/rc.conf index ea21295..91e96c1 100644 --- a/default-config/etc/rc.conf +++ b/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" -KEYMAP="us" -CONSOLEFONT= -CONSOLEMAP= +TIMEZONE="##TIMEZONE##" +KEYMAP="##KEYMAP##" +CONSOLEFONT="" +CONSOLEMAP="" USECOLOR="yes" MOD_AUTOLOAD="yes" diff --git a/default-config/etc/rc.d/archiso b/default-config/etc/rc.d/archiso index 6acf18a..35ce22c 100644 --- a/default-config/etc/rc.d/archiso +++ b/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...
diff --git a/default-config/etc/rc.sysinit-proxy b/default-config/etc/rc.sysinit-proxy new file mode 100644 index 0000000..7b1bb50 --- /dev/null +++ b/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
|