From de3489de3115b3ff9af2388b82dd423dd8e3135ce8010d49aca901b7fab3ebd2 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Tue, 23 Feb 2010 22:17:00 +0000 Subject: [PATCH 1/7] 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 } From 2c04071a40d6177e61b85f134d9c318137a4c9aa1c4612c1bfeb33119f89f166 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Tue, 9 Mar 2010 21:19:41 +0000 Subject: [PATCH 2/7] 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 # From 1d341f608b35b9ee78927a8c6f3a008b3a5d39c42c6f3f2abc5cc2363df3dcf9 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 9 Mar 2010 23:31:01 +0000 Subject: [PATCH 3/7] 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 | 13 ------------- nfs.init | 15 ++------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/nfs-utils.changes b/nfs-utils.changes index 3acc902..4483717 100644 --- a/nfs-utils.changes +++ b/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 diff --git a/nfs.init b/nfs.init index a1c851f..0a281e5 100644 --- a/nfs.init +++ b/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 # From 682a39e30de2cfd692f4db36b88d9a692b25c98f6fe62d99c19e3c8e46c251b0 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Mon, 29 Mar 2010 11:54:09 +0000 Subject: [PATCH 4/7] Accepting request 35840 from home:michal-m:branches:Base:System Copy from home:michal-m:branches:Base:System/nfs-utils via accept of submit request 35840 revision 2. Request was accepted with message: receive and volley OBS-URL: https://build.opensuse.org/request/show/35840 OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=13 --- mkinitrd-boot.sh | 18 ++++++++++-------- nfs-utils.changes | 19 +++++++++++++++++++ nfs-utils.spec | 4 ++-- nfs.init | 15 +++++++++++++-- ready | 0 5 files changed, 44 insertions(+), 12 deletions(-) delete mode 100644 ready diff --git a/mkinitrd-boot.sh b/mkinitrd-boot.sh index 1e0c8c4..5f9543b 100644 --- a/mkinitrd-boot.sh +++ b/mkinitrd-boot.sh @@ -2,7 +2,7 @@ #%stage: block #%modules: nfs #%programs: /sbin/mount.nfs -#%if: "$rootfstype" = "nfs" -o "$interface" +#%if: "$rootfstype" = "nfs" -a "$interface" # ##### Network FileSystem ## @@ -22,6 +22,8 @@ if [ -n "$ROOTPATH" -a -z "$cmd_root" ] ; then case "$ROOTPATH" in + iscsi:*) + ;; *:*) rootfstype="nfs" rootdev="$ROOTPATH" ;; @@ -40,17 +42,17 @@ if [ -n "$ROOTPATH" -a -z "$cmd_root" ] ; then fi fi -if [ -z "$rootdev" ]; then - echo "no local root= kernel option given and no root server set by the dhcp server." - echo "exiting to /bin/sh" - cd / - PATH=$PATH PS1='$ ' /bin/sh -i -fi - if [ "$rootfstype" = "nfs" ]; then # load the nfs module before using it load_modules + if [ -z "$rootdev" ]; then + echo "no local root= kernel option given and no root server set by the dhcp server." + echo "exiting to /bin/sh" + cd / + PATH=$PATH PS1='$ ' /bin/sh -i + fi + rootfsmod= if [ -n "$rootflags" ] ; then rootflags="${rootflags},nolock" diff --git a/nfs-utils.changes b/nfs-utils.changes index 4483717..99d32b8 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -1,3 +1,22 @@ +Fri Mar 26 15:39:05 CET 2010 - mmarek@suse.cz + +- mkinitrd-boot.sh: Do not do anything over if iscsi should be used + (bnc#590135). + +------------------------------------------------------------------- +------------------------------------------------------------------- +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 diff --git a/nfs-utils.spec b/nfs-utils.spec index 399cd96..a25455b 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -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 @@ BuildRequires: libevent 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 diff --git a/nfs.init b/nfs.init index 0a281e5..a1c851f 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 } @@ -223,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 # diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 From d334228ead189878f276ffe9e103f12f7a6d825bc8d1987cfa152f57b4c8ba89 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Mon, 29 Mar 2010 12:05:29 +0000 Subject: [PATCH 5/7] ... OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=14 --- nfs-utils.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nfs-utils.changes b/nfs-utils.changes index 99d32b8..2243fc8 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -1,9 +1,9 @@ +------------------------------------------------------------------- Fri Mar 26 15:39:05 CET 2010 - mmarek@suse.cz - mkinitrd-boot.sh: Do not do anything over if iscsi should be used (bnc#590135). -------------------------------------------------------------------- ------------------------------------------------------------------- Tue Mar 9 21:18:22 UTC 2010 - nfbrown@novell.com From f2bbb9ba618a91b0c5b4bec5e68de927e316105a099ce19573f5ddc6cc6eb620 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 31 Mar 2010 17:28:51 +0000 Subject: [PATCH 6/7] Accepting request 35966 from Base:System checked in (request 35966) OBS-URL: https://build.opensuse.org/request/show/35966 OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=15 --- mkinitrd-boot.sh | 18 ++++++++---------- nfs-utils.changes | 6 ------ 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/mkinitrd-boot.sh b/mkinitrd-boot.sh index 5f9543b..1e0c8c4 100644 --- a/mkinitrd-boot.sh +++ b/mkinitrd-boot.sh @@ -2,7 +2,7 @@ #%stage: block #%modules: nfs #%programs: /sbin/mount.nfs -#%if: "$rootfstype" = "nfs" -a "$interface" +#%if: "$rootfstype" = "nfs" -o "$interface" # ##### Network FileSystem ## @@ -22,8 +22,6 @@ if [ -n "$ROOTPATH" -a -z "$cmd_root" ] ; then case "$ROOTPATH" in - iscsi:*) - ;; *:*) rootfstype="nfs" rootdev="$ROOTPATH" ;; @@ -42,17 +40,17 @@ if [ -n "$ROOTPATH" -a -z "$cmd_root" ] ; then fi fi +if [ -z "$rootdev" ]; then + echo "no local root= kernel option given and no root server set by the dhcp server." + echo "exiting to /bin/sh" + cd / + PATH=$PATH PS1='$ ' /bin/sh -i +fi + if [ "$rootfstype" = "nfs" ]; then # load the nfs module before using it load_modules - if [ -z "$rootdev" ]; then - echo "no local root= kernel option given and no root server set by the dhcp server." - echo "exiting to /bin/sh" - cd / - PATH=$PATH PS1='$ ' /bin/sh -i - fi - rootfsmod= if [ -n "$rootflags" ] ; then rootflags="${rootflags},nolock" diff --git a/nfs-utils.changes b/nfs-utils.changes index 2243fc8..3acc902 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Fri Mar 26 15:39:05 CET 2010 - mmarek@suse.cz - -- mkinitrd-boot.sh: Do not do anything over if iscsi should be used - (bnc#590135). - ------------------------------------------------------------------- Tue Mar 9 21:18:22 UTC 2010 - nfbrown@novell.com From f3876d9ada5e712c48080e03d3b0b46b14c2a496e72b464556af48788d255c32 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 31 Mar 2010 17:28:52 +0000 Subject: [PATCH 7/7] Updating link to change in openSUSE:Factory/nfs-utils revision 55.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=3042a911ddae4a342e82ab5e95428693 --- mkinitrd-boot.sh | 18 ++++++++++-------- nfs-utils.changes | 6 ++++++ nfs-utils.spec | 2 +- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/mkinitrd-boot.sh b/mkinitrd-boot.sh index 1e0c8c4..5f9543b 100644 --- a/mkinitrd-boot.sh +++ b/mkinitrd-boot.sh @@ -2,7 +2,7 @@ #%stage: block #%modules: nfs #%programs: /sbin/mount.nfs -#%if: "$rootfstype" = "nfs" -o "$interface" +#%if: "$rootfstype" = "nfs" -a "$interface" # ##### Network FileSystem ## @@ -22,6 +22,8 @@ if [ -n "$ROOTPATH" -a -z "$cmd_root" ] ; then case "$ROOTPATH" in + iscsi:*) + ;; *:*) rootfstype="nfs" rootdev="$ROOTPATH" ;; @@ -40,17 +42,17 @@ if [ -n "$ROOTPATH" -a -z "$cmd_root" ] ; then fi fi -if [ -z "$rootdev" ]; then - echo "no local root= kernel option given and no root server set by the dhcp server." - echo "exiting to /bin/sh" - cd / - PATH=$PATH PS1='$ ' /bin/sh -i -fi - if [ "$rootfstype" = "nfs" ]; then # load the nfs module before using it load_modules + if [ -z "$rootdev" ]; then + echo "no local root= kernel option given and no root server set by the dhcp server." + echo "exiting to /bin/sh" + cd / + PATH=$PATH PS1='$ ' /bin/sh -i + fi + rootfsmod= if [ -n "$rootflags" ] ; then rootflags="${rootflags},nolock" diff --git a/nfs-utils.changes b/nfs-utils.changes index 3acc902..2243fc8 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 26 15:39:05 CET 2010 - mmarek@suse.cz + +- mkinitrd-boot.sh: Do not do anything over if iscsi should be used + (bnc#590135). + ------------------------------------------------------------------- Tue Mar 9 21:18:22 UTC 2010 - nfbrown@novell.com diff --git a/nfs-utils.spec b/nfs-utils.spec index a25455b..3a44948 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -27,7 +27,7 @@ BuildRequires: libevent Url: http://nfs.sourceforge.net Summary: Support Utilities for Kernel nfsd Version: 1.2.1 -Release: 3 +Release: 4 Group: Productivity/Networking/NFS License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build