mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
'add rootdeleay earlier'
This commit is contained in:
parent
476d87fc21
commit
8e3ce882f3
1 changed files with 7 additions and 7 deletions
|
@ -65,6 +65,13 @@ for m in ${MODULES}; do
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# If rootdelay is empty or not a non-negative integer, set it to 10
|
||||||
|
if [ -z "${rootdelay}" -o ! "${rootdelay}" -ge 0 ]; then
|
||||||
|
export rootdelay=10
|
||||||
|
# We'll wait for the root device, so make sure klibc doesn't
|
||||||
|
export kinit_params="$kinit_params rootdelay=0"
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -e "/hooks" ]; then
|
if [ -e "/hooks" ]; then
|
||||||
for h in ${HOOKS}; do
|
for h in ${HOOKS}; do
|
||||||
TST=""
|
TST=""
|
||||||
|
@ -90,13 +97,6 @@ if [ "${root}" = "" -a "${ip}" = "" ]; then
|
||||||
# enter install environment
|
# enter install environment
|
||||||
exec /sbin/init
|
exec /sbin/init
|
||||||
else
|
else
|
||||||
# If rootdelay is empty or not a non-negative integer, set it to 10
|
|
||||||
if [ -z "${rootdelay}" -o ! "${rootdelay}" -ge 0 ]; then
|
|
||||||
export rootdelay=10
|
|
||||||
# We'll wait for the root device, so make sure klibc doesn't
|
|
||||||
export kinit_params="$kinit_params rootdelay=0"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# If we boot from NFS, don't check for a block device in /dev
|
# If we boot from NFS, don't check for a block device in /dev
|
||||||
# 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
|
||||||
|
|
Loading…
Reference in a new issue