diff --git a/nfs-utils.changes b/nfs-utils.changes index 385bd69..bfd0b52 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -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 diff --git a/nfs-utils.spec b/nfs-utils.spec index 6c12e17..9f0c8c9 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -202,7 +202,7 @@ useradd -r -c 'NFS statd daemon' \ chown statd:nogroup /var/lib/nfs chown -R statd /var/lib/nfs/{state,sm,sm.bak} >& /dev/null || : [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup -%{fillup_and_insserv -Y -n nfs nfs} +%{fillup_and_insserv -n nfs nfs} %run_permissions %preun -n nfs-client diff --git a/nfs.init b/nfs.init index a1c851f..6e0871b 100644 --- a/nfs.init +++ b/nfs.init @@ -216,6 +216,7 @@ case "$1-$nfs" in echo $IDMAPD_BIN > $IDMAPD_CLIENT_STATE fi + rc_status -v # remark: statd is started when needed by mount.nfs # 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 # as if there are 'bg' mounts, we could get multiple copies # of them. So always 'settle' if there is any mounting to do. + echo -n "Mounting network file systems ..." udevadm settle - mount -at nfs,nfs4 > /dev/null 2>&1 + mount -at nfs,nfs4 || rc_failed 1 + rc_status -v fi # # generate new list of available shared libraries # if test "$NEED_LDCONFIG" = yes; then # 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 # - rc_status -v ;; stop* ) echo -n "Shutting down NFS client services:"