diff options
author | Aaron Griffin <aaron@archlinux.org> | 2006-06-14 03:07:04 +0200 |
---|---|---|
committer | Aaron Griffin <aaron@archlinux.org> | 2006-06-14 03:07:04 +0200 |
commit | 851b4e2c2b119692c30f185b1c0d10b07cacc322 (patch) | |
tree | 87b0a701902484cfc13708ea6d686b6956f4557b /init | |
parent | b31ed489b977662292aa39978ee737b94b60af14 (diff) | |
download | mkinitcpio-851b4e2c2b119692c30f185b1c0d10b07cacc322.tar.gz mkinitcpio-851b4e2c2b119692c30f185b1c0d10b07cacc322.tar.xz |
kinit param handling changes
encryption /dev/mapper dir (whoops)
git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@125 880c04e9-e011-0410-abf7-b926e227c9cd
Diffstat (limited to 'init')
-rw-r--r-- | init | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -2,7 +2,6 @@ msg () { [ "${quiet}" != "y" ] && echo $@; } err () { echo "ERROR: $@"; } -kparams () { echo -n "$@" >> /arch.cmd; } msg ":: Loading Initramfs" @@ -13,12 +12,13 @@ read CMDLINE </proc/cmdline export CMDLINE # Used so hooks can override params to kinit +export kinit_params="" export root="" echo "/bin/modprobe" > /proc/sys/kernel/modprobe for cmd in $CMDLINE; do case "$cmd" in - [0123456Ss]) continue ;; + [0123456Ss]) export runlevel="$cmd" ;; *=*) export "${cmd}" ;; *) export "${cmd}=y" ;; esac @@ -81,4 +81,4 @@ fi msg ":: Initramfs Completed - control passing to kinit" echo "/sbin/modprobe" > /proc/sys/kernel/modprobe -exec /bin/kinit "root=${root}" "${CMDLINE}" +exec /bin/kinit -- "root=${root}" ${kinit_params} "${runlevel}" > /dev/null 2>&1 |