Accepting request 34462 from Base:System

checked in (request 34462)

OBS-URL: https://build.opensuse.org/request/show/34462
OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=12

nfs-utils.changes

@@ -1,16 +1,3 @@
--------------------------------------------------------------------
-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
-
-- 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
 

nfs.init

@@ -134,11 +134,7 @@ mount_usr() {
     test -n "$usr" -o -n "$opt" || return
     local where
     for where in $usr $opt ; do
-	mount -o nolock $where || {
-	    # maybe network device hasn't appeared yet.
-	    udevadm settle
-	    mount -o nolock $where
-	}
+	mount -o nolock $where	
     done
 }
 
@@ -227,14 +223,7 @@ case "$1-$nfs" in
 	#   sleep 2 && mount -at nfs,nfs4 &
 	#   sleep 2 
 	#  
-	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
+	if test "$nfs" = yes ; then
             mount -at nfs,nfs4 > /dev/null 2>&1
 	fi
 	#