put back the nfs mount in the udev event
it solves the following case: root=/dev/nfs nfsroot=server:/path - the server could be reachable on any interface - any interface can get an IP by dhcp - only one IP is allowed to mount the rootmaster
parent
aa254c5596
commit
5b2db7d177
|
|
@ -142,9 +142,9 @@ if [ "$nfs" = "nfs4" ]; then
|
||||||
[ -z "$(pidof rpc.idmapd)" ] && rpc.idmapd
|
[ -z "$(pidof rpc.idmapd)" ] && rpc.idmapd
|
||||||
|
|
||||||
# XXX Should we loop here?
|
# XXX Should we loop here?
|
||||||
echo mount -t nfs4 -o$options${nfslock+,$nfslock} \
|
mount -t nfs4 -o$options${nfslock+,$nfslock} \
|
||||||
$server:$path $NEWROOT > /mount/01-$$-nfs4.sh
|
$server:$path $NEWROOT \
|
||||||
[ -e /dev/root ] || >/dev/root
|
&& { [ -e /dev/root ] || >/dev/root ; }
|
||||||
else
|
else
|
||||||
# NFSv{2,3} doesn't support using locks as it requires a helper to transfer
|
# NFSv{2,3} doesn't support using locks as it requires a helper to transfer
|
||||||
# the rpcbind state to the new root
|
# the rpcbind state to the new root
|
||||||
|
|
@ -152,7 +152,6 @@ else
|
||||||
warn "Locks unsupported on NFSv{2,3}, using nolock" 1>&2
|
warn "Locks unsupported on NFSv{2,3}, using nolock" 1>&2
|
||||||
|
|
||||||
# XXX Should we loop here?
|
# XXX Should we loop here?
|
||||||
echo mount -t nfs -o$options${options:+,}nolock $server:$path $NEWROOT \
|
mount -t nfs -o$options${options:+,}nolock $server:$path $NEWROOT \
|
||||||
> /mount/01-$$-nfs.sh
|
&& { [ -e /dev/root ] || >/dev/root ; }
|
||||||
[ -e /dev/root ] || >/dev/root
|
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue