Hello community, here is the log from the commit of package nfs-utils for openSUSE:Factory checked in at Wed Mar 10 00:31:00 CET 2010. -------- --- nfs-utils/nfs-utils.changes 2009-11-29 23:03:34.000000000 +0100 +++ /mounts/work_src_done/STABLE/nfs-utils/nfs-utils.changes 2010-03-09 22:19:37.000000000 +0100 @@ -1,0 +2,13 @@ +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 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nfs-utils.spec ++++++ --- /var/tmp/diff_new_pack.BQ5EqK/_old 2010-03-10 00:29:00.000000000 +0100 +++ /var/tmp/diff_new_pack.BQ5EqK/_new 2010-03-10 00:29:00.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package nfs-utils (Version 1.2.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,7 @@ Url: http://nfs.sourceforge.net Summary: Support Utilities for Kernel nfsd Version: 1.2.1 -Release: 2 +Release: 3 Group: Productivity/Networking/NFS License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ nfs.init ++++++ --- /var/tmp/diff_new_pack.BQ5EqK/_old 2010-03-10 00:29:00.000000000 +0100 +++ /var/tmp/diff_new_pack.BQ5EqK/_new 2010-03-10 00:29:00.000000000 +0100 @@ -134,7 +134,11 @@ 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 } @@ -223,7 +227,14 @@ # 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 # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org