Accepting request 58259 from Base:System

Accepted submit request 58259 from user elvigia

OBS-URL: https://build.opensuse.org/request/show/58259
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nfs-utils?expand=0&rev=64
This commit is contained in:
Marcus Rückert 2011-01-15 02:00:26 +00:00 committed by Git OBS Bridge
commit 15a973b7cb
3 changed files with 14 additions and 4 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Jan 12 12:15:31 UTC 2011 - lnussel@suse.de
- don't enable nfs init script by default. The yast nfs module
makes sure the script gets enabled when adding mounts
- print a message to tell when file systems are mounted as that
could take a while
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 7 11:18:24 UTC 2010 - coolo@novell.com Tue Dec 7 11:18:24 UTC 2010 - coolo@novell.com

View File

@ -202,7 +202,7 @@ useradd -r -c 'NFS statd daemon' \
chown statd:nogroup /var/lib/nfs chown statd:nogroup /var/lib/nfs
chown -R statd /var/lib/nfs/{state,sm,sm.bak} >& /dev/null || : chown -R statd /var/lib/nfs/{state,sm,sm.bak} >& /dev/null || :
[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
%{fillup_and_insserv -Y -n nfs nfs} %{fillup_and_insserv -n nfs nfs}
%run_permissions %run_permissions
%preun -n nfs-client %preun -n nfs-client

View File

@ -216,6 +216,7 @@ case "$1-$nfs" in
echo $IDMAPD_BIN > $IDMAPD_CLIENT_STATE echo $IDMAPD_BIN > $IDMAPD_CLIENT_STATE
fi fi
rc_status -v
# remark: statd is started when needed by mount.nfs # remark: statd is started when needed by mount.nfs
# Mount all auto NFS devices (-> nfs(5) and mount(8) ) # Mount all auto NFS devices (-> nfs(5) and mount(8) )
@ -234,18 +235,19 @@ case "$1-$nfs" in
# We cannot try the mount and on failure: 'settle' and try again # We cannot try the mount and on failure: 'settle' and try again
# as if there are 'bg' mounts, we could get multiple copies # as if there are 'bg' mounts, we could get multiple copies
# of them. So always 'settle' if there is any mounting to do. # of them. So always 'settle' if there is any mounting to do.
echo -n "Mounting network file systems ..."
udevadm settle udevadm settle
mount -at nfs,nfs4 > /dev/null 2>&1 mount -at nfs,nfs4 || rc_failed 1
rc_status -v
fi fi
# #
# generate new list of available shared libraries # generate new list of available shared libraries
# #
if test "$NEED_LDCONFIG" = yes; then if test "$NEED_LDCONFIG" = yes; then
# check if ld.so.cache needs to be refreshed # check if ld.so.cache needs to be refreshed
/etc/init.d/boot.ldconfig start > /dev/null 2>&1 /etc/init.d/boot.ldconfig start
fi fi
# #
rc_status -v
;; ;;
stop* ) stop* )
echo -n "Shutting down NFS client services:" echo -n "Shutting down NFS client services:"