rpm/nfs-utils
SHA256
1
0
Fork 0
forked from pool/nfs-utils
Code Pull Requests Activity

Accepting request 59569 from Base:System

Browse Source 
Accepted submit request 59569 from user elvigia

OBS-URL: https://build.opensuse.org/request/show/59569
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nfs-utils?expand=0&rev=68
This commit is contained in:
Ruediger Oertel 2011-02-02 00:47:16 +00:00 committed by Git OBS Bridge
commit e90aa0d140
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nfs-utils.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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
- 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 Tue Jan 25 09:01:37 UTC 2011 - lnussel@suse.de

13
nfs-utils.spec
View File

@ -54,6 +54,7 @@ Patch2: nfs-utils-clear-mountd-reg
Patch3: nfs-utils-allow-port-number-sharing Patch3: nfs-utils-allow-port-number-sharing
Patch4: nfs-utils-improve-v4-umount Patch4: nfs-utils-improve-v4-umount
Patch5: nfs-utils-fix-remount Patch5: nfs-utils-fix-remount
Suggests: python-base
%description %description
This package contains the NFS utilities. You can tune the number of 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:10} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-nfs.sh
install -m 755 %{S:12} $RPM_BUILD_ROOT/usr/sbin/start-statd 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 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 %clean
rm -rf $RPM_BUILD_ROOT 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 || : 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 -n nfs nfs} %{fillup_and_insserv -n nfs nfs}
%run_permissions #
%set_permissions /sbin/mount.nfs
%preun -n nfs-client %preun -n nfs-client
%stop_on_removal nfs %stop_on_removal nfs
@ -212,7 +217,7 @@ chown -R statd /var/lib/nfs/{state,sm,sm.bak} >& /dev/null || :
%restart_on_update nfs %restart_on_update nfs
[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
%insserv_cleanup %insserv_cleanup
#userdel statd &> /dev/null || :
%verifyscript -n nfs-client %verifyscript -n nfs-client
%verify_permissions -e /sbin/mount.nfs %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 /sbin/umount.nfs4
/usr/sbin/gss_clnt_send_err /usr/sbin/gss_clnt_send_err
/usr/sbin/gss_destroy_creds /usr/sbin/gss_destroy_creds
/usr/sbin/mountstats %attr(0755,root,root) /usr/sbin/mountstats
/usr/sbin/nfsiostat %attr(0755,root,root) /usr/sbin/nfsiostat
/usr/sbin/nfsstat /usr/sbin/nfsstat
/usr/sbin/rcnfs /usr/sbin/rcnfs
/usr/sbin/rpc.gssd /usr/sbin/rpc.gssd

7
start-statd
View File

@ -18,9 +18,4 @@ if ! rpcinfo -p localhost >/dev/null 2>/dev/null; then
fi fi
# TODO: write init script and call that one via /sbin/service instead # TODO: write init script and call that one via /sbin/service instead
start_daemon /usr/sbin/rpc.statd --no-notify $STATD_OPTIONS start_daemon /usr/sbin/rpc.statd --no-notify $STATD_OPTIONS
if rc_status -v; then rc_status -v
# in case firewall needs to punch a hole for the
# statd port...
/etc/init.d/SuSEfirewall2_setup try-restart
fi