root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

'fixed missing fi'

Browse source
This commit is contained in:
Tobias Powalowski 2009-06-17 17:51:50 +02:00
parent 4096cfacc8
commit a6bc420c02
1 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
usr/share/archboot/base/init
View file

@ -101,37 +101,39 @@ else
# Let kinit do it all # Let kinit do it all
if [ -z "${nfsroot}" -a "${root}" != "/dev/nfs" ]; then if [ -z "${nfsroot}" -a "${root}" != "/dev/nfs" ]; then
if ! poll_device "${root}" ${rootdelay}; then if ! poll_device "${root}" ${rootdelay}; then
msg "\nRoot device '${root}' doesn't exist, attempting to create it" msg "\nRoot device '${root}' doesn't exist, attempting to create it"
eval $(/bin/parseblock "${root}") eval $(/bin/parseblock "${root}")
if [ -z "${BLOCKDEVICE}" ]; then if [ -z "${BLOCKDEVICE}" ]; then
echo "ERROR: Failed to parse block device ids for '${root}'" echo "ERROR: Failed to parse block device ids for '${root}'"
else else
echo "/bin/mknod /dev/root b ${BLOCKDEVICE}" echo "/bin/mknod /dev/root b ${BLOCKDEVICE}"
/bin/mknod /dev/root b ${BLOCKDEVICE} >/dev/null /bin/mknod /dev/root b ${BLOCKDEVICE} >/dev/null
export root="/dev/root" export root="/dev/root"
fi fi
if [ ! -b "${root}" -a ! -L "${root}" ]; then if [ ! -b "${root}" -a ! -L "${root}" ]; then
err "Unable to detect or create root device '${root}'" err "Unable to detect or create root device '${root}'"
echo "You are being dropped to a recovery shell" echo "You are being dropped to a recovery shell"
echo " Type 'reboot' to reboot" echo " Type 'reboot' to reboot"
echo " Type 'exit' to try and continue booting" echo " Type 'exit' to try and continue booting"
echo "NOTE: klibc contains no 'ls' binary, use 'echo *' instead" echo "NOTE: klibc contains no 'ls' binary, use 'echo *' instead"
echo "" echo ""
echo "If the device '${root}' gets created while you are here," echo "If the device '${root}' gets created while you are here,"
echo "try adding 'rootdelay=10' or higher to the kernel command-line" echo "try adding 'rootdelay=10' or higher to the kernel command-line"
PS1="ramfs$ " /bin/sh -i PS1="ramfs$ " /bin/sh -i
msg "Trying to continue (this will most likely fail)..." msg "Trying to continue (this will most likely fail)..."
fi
fi
fi fi
if [ -f "/message" ]; then if [ -f "/message" ]; then
msg "$(cat /message)" msg "$(cat /message)"
fi fi
msg ":: Initramfs Completed - control passing to kinit" msg ":: Initramfs Completed - control passing to kinit"
#Special handling is udev is running #Special handling is udev is running
udevpid=$(/bin/minips -C udevd -o pid=) udevpid=$(/bin/minips -C udevd -o pid=)
if [ -n "${udevpid}" ]; then if [ -n "${udevpid}" ]; then
/bin/kill -9 ${udevpid} /bin/kill -9 ${udevpid}
/bin/sleep 0.01 /bin/sleep 0.01
fi fi
exec /bin/kinit "$@" -- "root=${root}" ${kinit_params} > /dev/null 2>&1 exec /bin/kinit "$@" -- "root=${root}" ${kinit_params} > /dev/null 2>&1
fi fi