From 5a4a38468c30e32dfa2defc5c805c6eb95b271e0458045ac4e597c1c3d6d4b15 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 17 May 2018 10:37:30 +0000 Subject: [PATCH 1/2] boo#1093665 OBS-URL: https://build.opensuse.org/package/show/Base:System/psmisc?expand=0&rev=99 --- ...Use-mountinfo-to-be-able-to-use-the-mount-identity.patch | 6 +++--- psmisc.changes | 6 ++++++ psmisc.spec | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/0001-Use-mountinfo-to-be-able-to-use-the-mount-identity.patch b/0001-Use-mountinfo-to-be-able-to-use-the-mount-identity.patch index c0d872a..3e3f25b 100644 --- a/0001-Use-mountinfo-to-be-able-to-use-the-mount-identity.patch +++ b/0001-Use-mountinfo-to-be-able-to-use-the-mount-identity.patch @@ -1,4 +1,4 @@ -From c0652a4686d259dabdb3e96498d8dda7cdc9da03 Mon Sep 17 00:00:00 2001 +From a1d3fc4d5040dcc3e107b3b8dcf9756dbed38f45 Mon Sep 17 00:00:00 2001 From: Werner Fink Date: Thu, 29 Jun 2017 15:18:28 +0200 Subject: [PATCH] Use mountinfo to be able to use the mount identity @@ -64,7 +64,7 @@ index 176a2fc..d8d3366 100644 dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST diff --git src/fuser.c src/fuser.c -index 31ef30c..1c7c496 100644 +index 31ef30c..81f1064 100644 --- src/fuser.c +++ src/fuser.c @@ -32,6 +32,10 @@ @@ -625,7 +625,7 @@ index 31ef30c..1c7c496 100644 - ("Cannot allocate memory for matched proc: %s\n"), - strerror(errno)); - exit(1); -+ (mnt, "%i %i %u:%u %*s %s %*s %*s - %s %*[^\n]", ++ (mnt, "%i %i %u:%u %*s %s %*[^\-] - %s %*[^\n]", + &mid, &parid, &maj, &min, &mpoint[0], &type[0]) == 6) + (void)add_mntinfo(mpoint, type, mid, parid, makedev(maj, min)); +#else diff --git a/psmisc.changes b/psmisc.changes index 3f10213..975d6c9 100644 --- a/psmisc.changes +++ b/psmisc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 17 10:32:53 UTC 2018 - werner@suse.de + +- Modify patch 0001-Use-mountinfo-to-be-able-to-use-the-mount-identity.patch + to let fuser -m also work for private mounts as well (boo#1093665) + ------------------------------------------------------------------- Fri Oct 13 07:10:39 UTC 2017 - werner@suse.de diff --git a/psmisc.spec b/psmisc.spec index ef0ad0f..624bd0a 100644 --- a/psmisc.spec +++ b/psmisc.spec @@ -1,7 +1,7 @@ # # spec file for package psmisc # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,7 +31,7 @@ Release: 0 Provides: ps:/usr/bin/killall Recommends: %{name}-lang Summary: Utilities for managing processes on your system -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Monitoring %define hash 67b1da268f4c0ce6859980e3dfcfaec5b2448e80 Source: https://gitlab.com/%{name}/%{name}/repository/archive.tar.bz2?ref=v%{version}#/%{name}-%{version}.tar.bz2 From be9db4d850e4217316f94ac7f562edad8dcb0208079256d8280d4855cac4a79e Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 17 May 2018 10:43:20 +0000 Subject: [PATCH 2/2] boo#1093665 OBS-URL: https://build.opensuse.org/package/show/Base:System/psmisc?expand=0&rev=100 --- ...Use-mountinfo-to-be-able-to-use-the-mount-identity.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/0001-Use-mountinfo-to-be-able-to-use-the-mount-identity.patch b/0001-Use-mountinfo-to-be-able-to-use-the-mount-identity.patch index 3e3f25b..b558b19 100644 --- a/0001-Use-mountinfo-to-be-able-to-use-the-mount-identity.patch +++ b/0001-Use-mountinfo-to-be-able-to-use-the-mount-identity.patch @@ -1,4 +1,4 @@ -From a1d3fc4d5040dcc3e107b3b8dcf9756dbed38f45 Mon Sep 17 00:00:00 2001 +From d7487838d0c79bd007e63e9ba9f7933cec40e3c9 Mon Sep 17 00:00:00 2001 From: Werner Fink Date: Thu, 29 Jun 2017 15:18:28 +0200 Subject: [PATCH] Use mountinfo to be able to use the mount identity @@ -64,7 +64,7 @@ index 176a2fc..d8d3366 100644 dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST diff --git src/fuser.c src/fuser.c -index 31ef30c..81f1064 100644 +index 31ef30c..a204f08 100644 --- src/fuser.c +++ src/fuser.c @@ -32,6 +32,10 @@ @@ -625,7 +625,7 @@ index 31ef30c..81f1064 100644 - ("Cannot allocate memory for matched proc: %s\n"), - strerror(errno)); - exit(1); -+ (mnt, "%i %i %u:%u %*s %s %*[^\-] - %s %*[^\n]", ++ (mnt, "%i %i %u:%u %*s %s %*[^-] - %s %*[^\n]", + &mid, &parid, &maj, &min, &mpoint[0], &type[0]) == 6) + (void)add_mntinfo(mpoint, type, mid, parid, makedev(maj, min)); +#else