summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2006-06-06 07:22:35 +0200
committerAaron Griffin <aaron@archlinux.org>2006-06-06 07:22:35 +0200
commitb31ed489b977662292aa39978ee737b94b60af14 (patch)
tree483a6bf418d8899a703ebb4dc3d199a08c8b659c /init
parent60d742305a5cc070f56e97bc8954a342c3180aec (diff)
downloadmkinitcpio-b31ed489b977662292aa39978ee737b94b60af14.tar.gz
mkinitcpio-b31ed489b977662292aa39978ee737b94b60af14.tar.xz
New error conditions: fail on missing hook or missing module
Filesystem hook changes (parseblock handling) Init changes to allow /arch.cmd command line parsing Misc install script cleanups git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@123 880c04e9-e011-0410-abf7-b926e227c9cd
Diffstat (limited to 'init')
-rw-r--r--init4
1 files changed, 2 insertions, 2 deletions
diff --git a/init b/init
index 93fcc9a..2d8e9c8 100644
--- a/init
+++ b/init
@@ -2,6 +2,7 @@
msg () { [ "${quiet}" != "y" ] && echo $@; }
err () { echo "ERROR: $@"; }
+kparams () { echo -n "$@" >> /arch.cmd; }
msg ":: Loading Initramfs"
@@ -13,7 +14,6 @@ export CMDLINE
# Used so hooks can override params to kinit
export root=""
-export kinit_params=""
echo "/bin/modprobe" > /proc/sys/kernel/modprobe
for cmd in $CMDLINE; do
@@ -81,4 +81,4 @@ fi
msg ":: Initramfs Completed - control passing to kinit"
echo "/sbin/modprobe" > /proc/sys/kernel/modprobe
-exec /bin/kinit "root=${root}" ${kinit_params} < /dev/console > /dev/null 2>&1
+exec /bin/kinit "root=${root}" "${CMDLINE}"