From de3489de3115b3ff9af2388b82dd423dd8e3135ce8010d49aca901b7fab3ebd2 Mon Sep 17 00:00:00 2001
From: Neil Brown <nfbrown@suse.com>
Date: Tue, 23 Feb 2010 22:17:00 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=10

---
 nfs-utils.changes | 7 +++++++
 nfs.init          | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/nfs-utils.changes b/nfs-utils.changes
index 4483717..87f2eb7 100644
--- a/nfs-utils.changes
+++ b/nfs-utils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Feb 23 22:15:18 UTC 2010 - nfbrown@novell.com
+
+- init.nfs: if mounting /usr fails, call "udevadm settle"
+  and try again incase network interfaces are still
+  appearing.  bnc#571540
+
 -------------------------------------------------------------------
 Sun Nov 29 22:03:26 UTC 2009 - nfbrown@novell.com
 
diff --git a/nfs.init b/nfs.init
index 0a281e5..48e9375 100644
--- a/nfs.init
+++ b/nfs.init
@@ -134,7 +134,11 @@ mount_usr() {
     test -n "$usr" -o -n "$opt" || return
     local where
     for where in $usr $opt ; do
-	mount -o nolock $where	
+	mount -o nolock $where || {
+	    # maybe network device hasn't appeared yet.
+	    udevadm settle
+	    mount -o nolock $where
+	}
     done
 }