Dr. Werner Fink 2018-05-17 10:37:30 +00:00 committed by Git OBS Bridge
parent 5f6ff8d31b
commit 2b2b9d7d5a
3 changed files with 11 additions and 5 deletions

View File

@ -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 <werner@suse.de> From: Werner Fink <werner@suse.de>
Date: Thu, 29 Jun 2017 15:18:28 +0200 Date: Thu, 29 Jun 2017 15:18:28 +0200
Subject: [PATCH] Use mountinfo to be able to use the mount identity 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. dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST AC_C_CONST
diff --git src/fuser.c src/fuser.c diff --git src/fuser.c src/fuser.c
index 31ef30c..1c7c496 100644 index 31ef30c..81f1064 100644
--- src/fuser.c --- src/fuser.c
+++ src/fuser.c +++ src/fuser.c
@@ -32,6 +32,10 @@ @@ -32,6 +32,10 @@
@ -625,7 +625,7 @@ index 31ef30c..1c7c496 100644
- ("Cannot allocate memory for matched proc: %s\n"), - ("Cannot allocate memory for matched proc: %s\n"),
- strerror(errno)); - strerror(errno));
- exit(1); - 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) + &mid, &parid, &maj, &min, &mpoint[0], &type[0]) == 6)
+ (void)add_mntinfo(mpoint, type, mid, parid, makedev(maj, min)); + (void)add_mntinfo(mpoint, type, mid, parid, makedev(maj, min));
+#else +#else

View File

@ -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 Fri Oct 13 07:10:39 UTC 2017 - werner@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package psmisc # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -31,7 +31,7 @@ Release: 0
Provides: ps:/usr/bin/killall Provides: ps:/usr/bin/killall
Recommends: %{name}-lang Recommends: %{name}-lang
Summary: Utilities for managing processes on your system Summary: Utilities for managing processes on your system
License: GPL-2.0+ License: GPL-2.0-or-later
Group: System/Monitoring Group: System/Monitoring
%define hash 67b1da268f4c0ce6859980e3dfcfaec5b2448e80 %define hash 67b1da268f4c0ce6859980e3dfcfaec5b2448e80
Source: https://gitlab.com/%{name}/%{name}/repository/archive.tar.bz2?ref=v%{version}#/%{name}-%{version}.tar.bz2 Source: https://gitlab.com/%{name}/%{name}/repository/archive.tar.bz2?ref=v%{version}#/%{name}-%{version}.tar.bz2