pool/nfs-utils
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 35840 from home:michal-m:branches:Base:System

Browse Source 
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
This commit is contained in:
Ruediger Oertel 2010-03-29 11:54:09 +00:00 committed by Git OBS Bridge
parent 1d341f608b
commit 682a39e30d
5 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mkinitrd-boot.sh
View File

@ -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"

19
nfs-utils.changes
View File

@ -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

4
nfs-utils.spec
View File

@ -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

15
nfs.init
View File

@ -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
#

0
ready
View File