aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2017-06-23 14:51:16 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2017-06-23 14:52:20 -0700
commit5eaf116d571a17fdc0bd14fdb6761557bc4fa763 (patch)
tree529a8e1669f34d9b2b9b5da6c3e122505f2339c0 /defaults/initrd.scripts
parentmodules_load: add qemu_fw_cfg on supported hardware. (diff)
downloadgenkernel-5eaf116d571a17fdc0bd14fdb6761557bc4fa763.tar.gz
genkernel-5eaf116d571a17fdc0bd14fdb6761557bc4fa763.tar.bz2
genkernel-5eaf116d571a17fdc0bd14fdb6761557bc4fa763.zip
linuxrc: show why switch_root might fail, and make related code more readable.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Diffstat (limited to 'defaults/initrd.scripts')
-rw-r--r--defaults/initrd.scripts5
1 files changed, 5 insertions, 0 deletions
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index d00e1c7..efc6421 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -567,6 +567,7 @@ findnfsmount() {
else
bad_msg "The DHCP Server did not send a valid root-path."
bad_msg "Please check your DHCP setup, or provide a nfsroot=<...> parameter."
+ return 1
fi
fi
@@ -590,6 +591,7 @@ findnfsmount() {
REAL_ROOT="/dev/nfs"
else
bad_msg "NFS Mounting failed. Is the path corrent ?"
+ return 1
fi
else
good_msg "Attempting to mount NFS root on ${NFSROOT} with options ${NFSOPTIONS}"
@@ -599,12 +601,15 @@ findnfsmount() {
REAL_ROOT="/dev/nfs"
else
bad_msg "NFS Mounting failed. Is the path correct ?"
+ return 1
fi
# FIXME: Need to start portmap and the other rpc daemons in
# order to remount rw.
fi
fi
+ else # IP / DHCP
+ return 1
fi
}