From bf15efb9a15ab818040130e32b0f2cecb7ae56c3 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 17 Mar 2009 15:48:56 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/psmisc?expand=0&rev=15 --- psmisc-22.6-nfs4fuser.patch | 4 ++-- psmisc.changes | 5 +++++ psmisc.spec | 4 +++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/psmisc-22.6-nfs4fuser.patch b/psmisc-22.6-nfs4fuser.patch index d368c68..67933dc 100644 --- a/psmisc-22.6-nfs4fuser.patch +++ b/psmisc-22.6-nfs4fuser.patch @@ -33,7 +33,7 @@ cannot report on any processes that it doesn't have permission to look at the file descriptor table for. The most common time this problem occurs --- src/fuser.c -+++ src/fuser.c 2009-03-11 14:09:40.832002165 +0100 ++++ src/fuser.c 2009-03-12 10:21:40.980003767 +0100 @@ -32,9 +32,11 @@ #include #include @@ -376,7 +376,7 @@ - parse_unixsockets(this_name, &match_inodes, unixsockets); - if (opts & OPT_MOUNTPOINT || opts & OPT_MOUNTS) + len = strlen(this_name->filename); -+ if (this_name->filename[len-1] == '/') ++ if (len > 1 && this_name->filename[len-1] == '/') + this_name->filename[len-1] = '\0'; + parse_file(this_name, &match_inodes, opts); + parse_unixsockets(this_name, &match_inodes, unixsockets, netdev, opts); diff --git a/psmisc.changes b/psmisc.changes index afe8144..4bf31c5 100644 --- a/psmisc.changes +++ b/psmisc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 12 10:23:12 CET 2009 - werner@suse.de + +- nfs4fuser: be able to detect the root file system (bnc#464295) + ------------------------------------------------------------------- Wed Mar 11 14:24:06 CET 2009 - werner@suse.de diff --git a/psmisc.spec b/psmisc.spec index 13e057c..a0e7045 100644 --- a/psmisc.spec +++ b/psmisc.spec @@ -27,7 +27,7 @@ Group: System/Monitoring PreReq: %fillup_prereq %insserv_prereq AutoReqProv: on Version: 22.6 -Release: 62 +Release: 63 Provides: ps:/usr/bin/killall Summary: Utilities for managing processes on your system Source: http://switch.dl.sourceforge.net/sourceforge/psmisc/psmisc-%{version}.tar.bz2 @@ -105,6 +105,8 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/pstree.1* %changelog +* Thu Mar 12 2009 werner@suse.de +- nfs4fuser: be able to detect the root file system (bnc#464295) * Wed Mar 11 2009 werner@suse.de - nfs4fuser: make sure not to stumble on short named mount points to avoid to terminate processes on wrong mount points