summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimo Leone <simo@archlinux.org>2007-10-06 21:13:17 -0500
committerDan McGee <dpmcgee@gmail.com>2007-10-09 20:59:26 -0500
commit8dea2b65fc1b027f27b2855e10c03ce5699ea9fe (patch)
treea07637e63b3aae2a872fdb17da66dd1c196f4bc0
parent5fa747b6cb8e160debbc33522d53f3fea04ad7b4 (diff)
downloadarchiso32-8dea2b65fc1b027f27b2855e10c03ce5699ea9fe.tar.xz
Fixed cmdline_param(), used in rc.conf
Turns out /proc gets mounted after rc.conf is sourced for the first time, so /proc/cmdline isn't such a great place to be getting parameters from in rc.conf. Use CMDLINE env variable instead, which is set to mostly the same thing (well the part we care about, at the least). Also cmdline_param wasn't breaking out of the loop properly. Signed-off-by: Simo Leone <simo@archlinux.org>
-rw-r--r--default-config/etc/archiso/functions5
1 files changed, 2 insertions, 3 deletions
diff --git a/default-config/etc/archiso/functions b/default-config/etc/archiso/functions
index d668b4c..fdd48f4 100644
--- a/default-config/etc/archiso/functions
+++ b/default-config/etc/archiso/functions
@@ -2,10 +2,9 @@
cmdline_param ()
{
- read cmdline < /proc/cmdline
- for param in ${cmdline}; do
+ for param in ${CMDLINE}; do
case "${param}" in
- $1=*) echo "${param##*=}"; break ;;
+ $1=*) echo "${param##*=}"; return ;;
*) continue ;;
esac
done