From a6f4aade287129f03411498d1309f21b2ea002752689993884881683cf2cfdb9 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 25 Jan 2011 12:24:00 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/nfs-utils revision 67.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=6ab25bef9982e1ec3d32c8f8c9b92b18 --- nfs-utils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nfs-utils.spec b/nfs-utils.spec index 44f3969..8d502fe 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.3 -Release: 3 +Release: 4 Group: Productivity/Networking/NFS License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build From af403cf1f5eb635e29aee80581f7e7bc56fbf7cd1c4ba05d9ba8e0318941c77b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Fri, 28 Jan 2011 15:45:32 +0000 Subject: [PATCH 2/3] Accepting request 59360 from home:lnussel:branches:Base:System OBS-URL: https://build.opensuse.org/request/show/59360 OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=33 --- nfs-utils.changes | 6 ++++++ nfs-utils.spec | 13 +++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/nfs-utils.changes b/nfs-utils.changes index 3993772..dd783b8 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 28 14:03:14 UTC 2011 - lnussel@suse.de + +- avoid python depdency to avoid bloating the minimal installation +- use %set_permissions instead of %run_permissions + ------------------------------------------------------------------- Tue Jan 25 09:01:37 UTC 2011 - lnussel@suse.de diff --git a/nfs-utils.spec b/nfs-utils.spec index 8d502fe..318d3be 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -54,6 +54,7 @@ Patch2: nfs-utils-clear-mountd-reg Patch3: nfs-utils-allow-port-number-sharing Patch4: nfs-utils-improve-v4-umount Patch5: nfs-utils-fix-remount +Suggests: python-base %description This package contains the NFS utilities. You can tune the number of @@ -190,6 +191,9 @@ install -m 755 %{S:9} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-nfs.sh install -m 755 %{S:10} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-nfs.sh install -m 755 %{S:12} $RPM_BUILD_ROOT/usr/sbin/start-statd install -m 644 utils/mount/nfsmount.conf $RPM_BUILD_ROOT/etc/nfsmount.conf +# +# hack to avoid automatic python dependency +chmod 644 $RPM_BUILD_ROOT%{_sbindir}/{mountstats,nfsiostat} %clean rm -rf $RPM_BUILD_ROOT @@ -203,7 +207,8 @@ 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 -n nfs nfs} -%run_permissions +# +%set_permissions /sbin/mount.nfs %preun -n nfs-client %stop_on_removal nfs @@ -212,7 +217,7 @@ chown -R statd /var/lib/nfs/{state,sm,sm.bak} >& /dev/null || : %restart_on_update nfs [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup %insserv_cleanup -#userdel statd &> /dev/null || : + %verifyscript -n nfs-client %verify_permissions -e /sbin/mount.nfs @@ -241,8 +246,8 @@ chown -R statd /var/lib/nfs/{state,sm,sm.bak} >& /dev/null || : /sbin/umount.nfs4 /usr/sbin/gss_clnt_send_err /usr/sbin/gss_destroy_creds -/usr/sbin/mountstats -/usr/sbin/nfsiostat +%attr(0755,root,root) /usr/sbin/mountstats +%attr(0755,root,root) /usr/sbin/nfsiostat /usr/sbin/nfsstat /usr/sbin/rcnfs /usr/sbin/rpc.gssd From 4d7d2dffef7d6d119ba778ca5ce44682fa5f35eb18bc741e34eb395b1f6a7134 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Tue, 1 Feb 2011 00:15:25 +0000 Subject: [PATCH 3/3] Accepting request 59492 from home:lnussel:branches:Base:System OBS-URL: https://build.opensuse.org/request/show/59492 OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=34 --- nfs-utils.changes | 7 +++++++ start-statd | 7 +------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/nfs-utils.changes b/nfs-utils.changes index dd783b8..1250396 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jan 31 07:49:03 UTC 2011 - lnussel@suse.de + +- don't run SuSEfirewall2 from start-statd script. If SuSEfirewall2 + is installed and enabled it will be called at the end of the boot + process anyways (bnc#668181). + ------------------------------------------------------------------- Fri Jan 28 14:03:14 UTC 2011 - lnussel@suse.de diff --git a/start-statd b/start-statd index ff3e07c..6a3fde6 100644 --- a/start-statd +++ b/start-statd @@ -18,9 +18,4 @@ if ! rpcinfo -p localhost >/dev/null 2>/dev/null; then fi # TODO: write init script and call that one via /sbin/service instead start_daemon /usr/sbin/rpc.statd --no-notify $STATD_OPTIONS -if rc_status -v; then - # in case firewall needs to punch a hole for the - # statd port... - /etc/init.d/SuSEfirewall2_setup try-restart -fi - +rc_status -v