summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2006-05-10 04:56:28 +0200
committerAaron Griffin <aaron@archlinux.org>2006-05-10 04:56:28 +0200
commitb1d62938f81f41bfe84dca26de9edc0f91c11996 (patch)
tree3bfca625382a5c23c138cf8f81bfd3dfec22f326 /init
parent1851e5bb06747c54e0cb19371c6f1851eefd851e (diff)
downloadmkinitcpio-b1d62938f81f41bfe84dca26de9edc0f91c11996.tar.gz
mkinitcpio-b1d62938f81f41bfe84dca26de9edc0f91c11996.tar.xz
udev: remove extra copy of ieee1394
init/usb/fs: modify rootdelay handling filesystems: additional error checking, handing for numeric root devices mkinitcpio: remove /tmp modules directory if used git-svn-id: http://projects.archlinux.org/svn/initramfs/mkinitcpio@90 880c04e9-e011-0410-abf7-b926e227c9cd
Diffstat (limited to 'init')
-rw-r--r--init5
1 files changed, 4 insertions, 1 deletions
diff --git a/init b/init
index 774c106..7bdac5b 100644
--- a/init
+++ b/init
@@ -12,6 +12,8 @@ read CMDLINE </proc/cmdline
export CMDLINE
# Used so hooks can override params to kinit
+export root=""
+export rootdelay="0"
export kinit_params=""
echo "/bin/modprobe" > /proc/sys/kernel/modprobe
@@ -65,6 +67,7 @@ fi
if [ "${break}" = "y" ]; then
echo ":: Break requested, type 'exit' to resume operation"
+ echo " NOTE: klibc contains no 'ls' binary, used 'echo *' instead"
PS1="ramfs$ " /bin/sh -i
fi
@@ -79,4 +82,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/console
+exec /bin/kinit "root=${root}" "rootdelay=${rootdelay}" ${kinit_params} < /dev/console > /dev/null 2>&1