summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2012-12-23 19:58:36 +0100
committerDave Reisner <dreisner@archlinux.org>2013-05-07 19:17:39 +0200
commitd662258b8769af81a036b7d4cd0af0a66e33dbb2 (patch)
treeae972606b1e8acadaa78ebbbff727efa1923df05
parent40a62e9c5fb70b02ade89965dea6d2cb96672017 (diff)
downloadmkinitcpio-d662258b8769af81a036b7d4cd0af0a66e33dbb2.tar.gz
mkinitcpio-d662258b8769af81a036b7d4cd0af0a66e33dbb2.tar.xz
init: redirect /proc/cmdline to parse_cmdline
This makes it easier to test parse_cmdline. Signed-off-by: Dave Reisner <dreisner@archlinux.org>
-rw-r--r--init2
-rw-r--r--init_functions2
2 files changed, 2 insertions, 2 deletions
diff --git a/init b/init
index f3f9253..dfebd53 100644
--- a/init
+++ b/init
@@ -17,7 +17,7 @@ mount -t tmpfs run /run -o nosuid,nodev,mode=0755
mkdir -m755 /run/initramfs
# parse the kernel command line
-parse_cmdline
+parse_cmdline </proc/cmdline
for d in ${disablehooks//,/ }; do
[ -e "/hooks/$d" ] && chmod 644 "/hooks/$d"
diff --git a/init_functions b/init_functions
index ff6a3b4..dc4361a 100644
--- a/init_functions
+++ b/init_functions
@@ -72,7 +72,7 @@ run_hookfunctions() {
parse_cmdline() {
local _w _quoted _lhs _rhs _cmdline
- read -r _cmdline </proc/cmdline
+ read -r _cmdline
for _w in $_cmdline; do
if [ -z "$_quoted" ]; then
case $_w in