Compare commits
3 Commits
Author | SHA1 | Date |
---|---|---|
Karel Zak | a422089368 | |
Karel Zak | cdfdebd9ba | |
Karel Zak | f7bf3a9f68 |
|
@ -0,0 +1,30 @@
|
||||||
|
From c64d452b3eb85fe55e238144082247b05cc143ea Mon Sep 17 00:00:00 2001
|
||||||
|
From: Karel Zak <kzak@redhat.com>
|
||||||
|
Date: Mon, 22 Jul 2019 11:10:30 +0200
|
||||||
|
Subject: [PATCH] fstrim: fix systemd service protection
|
||||||
|
|
||||||
|
ProtectHome=yes makes /home inaccessible, but we need to open the
|
||||||
|
directories (mountpoints) read-only.
|
||||||
|
|
||||||
|
Addresses: https://github.com/karelzak/util-linux/issues/824
|
||||||
|
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||||||
|
---
|
||||||
|
sys-utils/fstrim.service.in | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/sys-utils/fstrim.service.in b/sys-utils/fstrim.service.in
|
||||||
|
index 516023ed8..2a8dc1d3a 100644
|
||||||
|
--- a/sys-utils/fstrim.service.in
|
||||||
|
+++ b/sys-utils/fstrim.service.in
|
||||||
|
@@ -6,7 +6,7 @@ Documentation=man:fstrim(8)
|
||||||
|
Type=oneshot
|
||||||
|
ExecStart=@sbindir@/fstrim --fstab --verbose --quiet
|
||||||
|
ProtectSystem=strict
|
||||||
|
-ProtectHome=yes
|
||||||
|
+ProtectHome=read-only
|
||||||
|
PrivateDevices=no
|
||||||
|
PrivateNetwork=yes
|
||||||
|
PrivateUsers=no
|
||||||
|
--
|
||||||
|
2.21.0
|
||||||
|
|
|
@ -0,0 +1,33 @@
|
||||||
|
From e3bb9bfb76c17b1d05814436ced62c05c4011f48 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Karel Zak <kzak@redhat.com>
|
||||||
|
Date: Thu, 27 Jun 2019 09:22:18 +0200
|
||||||
|
Subject: [PATCH] lsblk: force to print PKNAME for partition
|
||||||
|
|
||||||
|
PKNAME (parent kernel device name) is based on printed tree according
|
||||||
|
to parent -> child relationship. The tree is optional and not printed
|
||||||
|
if partition specified (.e.g "lsblk -o+PKNAME /dev/sda1"), but old
|
||||||
|
versions print the PKNAME also in this case.
|
||||||
|
|
||||||
|
Addresses: https://github.com/karelzak/util-linux/issues/813
|
||||||
|
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||||||
|
---
|
||||||
|
misc-utils/lsblk.c | 3 +++
|
||||||
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
|
||||||
|
index e95af7af0..3ce6da730 100644
|
||||||
|
--- a/misc-utils/lsblk.c
|
||||||
|
+++ b/misc-utils/lsblk.c
|
||||||
|
@@ -1019,6 +1019,9 @@ static void device_to_scols(
|
||||||
|
DBG(DEV, ul_debugobj(dev, "add '%s' to scols", dev->name));
|
||||||
|
ON_DBG(DEV, if (ul_path_isopen_dirfd(dev->sysfs)) ul_debugobj(dev, " %s ---> is open!", dev->name));
|
||||||
|
|
||||||
|
+ if (!parent && dev->wholedisk)
|
||||||
|
+ parent = dev->wholedisk;
|
||||||
|
+
|
||||||
|
/* Do not print device more than one in --list mode */
|
||||||
|
if (!(lsblk->flags & LSBLK_TREE) && dev->is_printed)
|
||||||
|
return;
|
||||||
|
--
|
||||||
|
2.21.0
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
Summary: A collection of basic system utilities
|
Summary: A collection of basic system utilities
|
||||||
Name: util-linux
|
Name: util-linux
|
||||||
Version: 2.34
|
Version: 2.34
|
||||||
Release: 2%{?dist}
|
Release: 4%{?dist}
|
||||||
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
|
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
|
||||||
URL: http://en.wikipedia.org/wiki/Util-linux
|
URL: http://en.wikipedia.org/wiki/Util-linux
|
||||||
|
|
||||||
|
@ -101,6 +101,11 @@ Requires: libfdisk = %{version}-%{release}
|
||||||
# 151635 - makeing /var/log/lastlog
|
# 151635 - makeing /var/log/lastlog
|
||||||
Patch0: 2.28-login-lastlog-create.patch
|
Patch0: 2.28-login-lastlog-create.patch
|
||||||
|
|
||||||
|
# 1751290 - regression: lsblk not showing PKNAME in f31+
|
||||||
|
Patch1: lsblk-force-to-print-PKNAME-for-partition.patch
|
||||||
|
# 1762640 - fstrim stopped working on /home partition
|
||||||
|
Patch2: fstrim-fix-systemd-service-protection.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The util-linux package contains a large variety of low-level system
|
The util-linux package contains a large variety of low-level system
|
||||||
utilities that are necessary for a Linux system to function. Among
|
utilities that are necessary for a Linux system to function. Among
|
||||||
|
@ -918,6 +923,12 @@ fi
|
||||||
%{_libdir}/python*/site-packages/libmount/
|
%{_libdir}/python*/site-packages/libmount/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Dec 16 2019 Karel Zak <kzak@redhat.com> - 2.34-4
|
||||||
|
- fix #1762640 - fstrim stopped working on /home partition
|
||||||
|
|
||||||
|
* Thu Sep 12 2019 Karel Zak <kzak@redhat.com> - 2.34-3
|
||||||
|
- fix #1751290 - regression: lsblk not showing PKNAME in f31+
|
||||||
|
|
||||||
* Wed Jul 24 2019 Karel Zak <kzak@redhat.com> - 2.34-2
|
* Wed Jul 24 2019 Karel Zak <kzak@redhat.com> - 2.34-2
|
||||||
- fix lscpu compilation on ppc
|
- fix lscpu compilation on ppc
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue