[arch-releng] [PATCH 1/3] Make cmdline_param work and conform to rc.d layout
From: Simo Leone
From: Simo Leone
From: Simo Leone
Simo, welcome back! I'll be expecting AIF patches now ;) Dieter
From: Simo Leone
From: Simo Leone
--- configs/syslinux-iso/overlay/etc/rc.conf | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/configs/syslinux-iso/overlay/etc/rc.conf b/configs/syslinux-iso/overlay/etc/rc.conf index ff18456..3ce3c5a 100644 --- a/configs/syslinux-iso/overlay/etc/rc.conf +++ b/configs/syslinux-iso/overlay/etc/rc.conf @@ -1,19 +1,19 @@ # # /etc/rc.conf - Main Configuration for Arch Linux
-. /etc/archiso/functions +. /etc/rc.d/functions
LOCALE_DEFAULT="en_US.UTF-8" CLOCK_DEFAULT="" TIMEZONE_DEFAULT="" KEYMAP_DEFAULT="us"
-LOCALE="$(cmdline_param locale ${LOCALE_DEFAULT})" -HARDWARECLOCK="$(cmdline_param clock ${CLOCK_DEFAULT})" -TIMEZONE="$(cmdline_param timezone ${TIMEZONE_DEFAULT})" -KEYMAP="$(cmdline_param keymap ${KEYMAP_DEFAULT})" -CONSOLEFONT="$(cmdline_param consolefont)" -CONSOLEMAP="$(cmdline_param consolemap)" +LOCALE="$(kernel_cmdline locale ${LOCALE_DEFAULT})" +HARDWARECLOCK="$(kernel_cmdline clock ${CLOCK_DEFAULT})" +TIMEZONE="$(kernel_cmdline timezone ${TIMEZONE_DEFAULT})" +KEYMAP="$(kernel_cmdline keymap ${KEYMAP_DEFAULT})" +CONSOLEFONT="$(kernel_cmdline consolefont)" +CONSOLEMAP="$(kernel_cmdline consolemap)" USECOLOR="yes"
MOD_AUTOLOAD="yes"
On 03/03/2011 07:44 AM, leone.simo@gmail.com wrote: pushed to master -- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1
From: Simo Leone
- Rename cmdline_param to kernel_cmdline - Move to /etc/rc.d/functions.d where it belongs --- configs/syslinux-iso/overlay/etc/archiso/functions | 12 ------------ configs/syslinux-iso/overlay/etc/rc.d/archiso | 1 - .../overlay/etc/rc.d/functions.d/archiso | 20 ++++++++++++++++++++ 3 files changed, 20 insertions(+), 13 deletions(-) delete mode 100644 configs/syslinux-iso/overlay/etc/archiso/functions create mode 100644 configs/syslinux-iso/overlay/etc/rc.d/functions.d/archiso
diff --git a/configs/syslinux-iso/overlay/etc/archiso/functions b/configs/syslinux-iso/overlay/etc/archiso/functions deleted file mode 100644 index fdd48f4..0000000 --- a/configs/syslinux-iso/overlay/etc/archiso/functions +++ /dev/null @@ -1,12 +0,0 @@ -# vim: set ft=sh: - -cmdline_param () -{ - for param in ${CMDLINE}; do - case "${param}" in - $1=*) echo "${param##*=}"; return ;; - *) continue ;; - esac - done - [ -n "${2}" ]&& echo "${2}" -} diff --git a/configs/syslinux-iso/overlay/etc/rc.d/archiso b/configs/syslinux-iso/overlay/etc/rc.d/archiso index 435152a..6f26f98 100755 --- a/configs/syslinux-iso/overlay/etc/rc.d/archiso +++ b/configs/syslinux-iso/overlay/etc/rc.d/archiso @@ -1,7 +1,6 @@ # vim: set ft=sh: . /etc/rc.conf . /etc/rc.d/functions -. /etc/archiso/functions
scan_network () diff --git a/configs/syslinux-iso/overlay/etc/rc.d/functions.d/archiso b/configs/syslinux-iso/overlay/etc/rc.d/functions.d/archiso new file mode 100644 index 0000000..02b41cf --- /dev/null +++ b/configs/syslinux-iso/overlay/etc/rc.d/functions.d/archiso @@ -0,0 +1,20 @@ +# vim: set ft=sh: + +# kernel_cmdline<param> +# Looks for a parameter on the kernel's boot-time command line. +# +# returns: 0 if param was found. Also prints its value if it was a K=V param. +# 1 if it was not +# +kernel_cmdline () +{ + for param in $(/bin/cat /proc/cmdline); do + case "${param}" in + $1=*) echo "${param##*=}"; return 0 ;; + $1) return 0 ;; + *) continue ;; + esac + done + + return 1 +}
On 03/02/2011 09:43 AM, leone.simo@gmail.com wrote: pushed all three patches to master. -- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1
participants (3)
-
Dieter Plaetinck
-
Gerardo Exequiel Pozzi
-
leone.simo@gmail.com