From 2c04071a40d6177e61b85f134d9c318137a4c9aa1c4612c1bfeb33119f89f166 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Tue, 9 Mar 2010 21:19:41 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=11 --- nfs-utils.changes | 6 ++++++ nfs.init | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/nfs-utils.changes b/nfs-utils.changes index 87f2eb7..3acc902 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 9 21:18:22 UTC 2010 - nfbrown@novell.com + +- init.nfs: also call 'udevadm settle' when mounting things + other than /usr and /opt. bnc#571540 + ------------------------------------------------------------------- Tue Feb 23 22:15:18 UTC 2010 - nfbrown@novell.com diff --git a/nfs.init b/nfs.init index 48e9375..a1c851f 100644 --- a/nfs.init +++ b/nfs.init @@ -227,7 +227,14 @@ case "$1-$nfs" in # sleep 2 && mount -at nfs,nfs4 & # sleep 2 # - if test "$nfs" = yes ; then + if test -n "$mnt" ; then + # If network devices are not yet discovered, mounts + # might fail, so we might need to 'udevadm settle' to + # wait for the interfaces. + # We cannot try the mount and on failure: 'settle' and try again + # as if there are 'bg' mounts, we could get multiple copies + # of them. So always 'settle' if there is any mounting to do. + udevadm settle mount -at nfs,nfs4 > /dev/null 2>&1 fi #