systemd-239-82.5
Resolves: RHEL-77145,RHEL-81056
This commit is contained in:
Jan Macku
parent
70812941eb
commit
a81c479dad
@ -0,0 +1,44 @@
|
||||
From 687f9b3e04a65d2f39f15e7e0090de940c08ff37 Mon Sep 17 00:00:00 2001
|
||||
From: Lennart Poettering <lennart@poettering.net>
|
||||
Date: Wed, 8 Nov 2023 10:56:07 +0100
|
||||
Subject: [PATCH] man: be even clearer that tmpfiles user/group/mode are
|
||||
applied on existing inodes
|
||||
|
||||
I think it was clear already, but let's be even clearer.
|
||||
|
||||
Fixes: #29774
|
||||
(cherry picked from commit 3cb938bd12b3603984b982e9b73e4cabd4a608e3)
|
||||
|
||||
Resolves: RHEL-77145
|
||||
---
|
||||
man/tmpfiles.d.xml | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
|
||||
index e2e2eac228..1c4b575c65 100644
|
||||
--- a/man/tmpfiles.d.xml
|
||||
+++ b/man/tmpfiles.d.xml
|
||||
@@ -500,6 +500,11 @@ r! /tmp/.X[0-9]*-lock</programlisting>
|
||||
sticky/SUID/SGID bit is removed unless applied to a
|
||||
directory. This functionality is particularly useful in
|
||||
conjunction with <varname>Z</varname>.</para>
|
||||
+
|
||||
+ <para>By default the access mode of listed inodes is set to the specified mode regardless if it is
|
||||
+ created anew, or already existed. Optionally, if prefixed with <literal>:</literal>, the configured
|
||||
+ access mode is only applied when creating new inodes, and if the inode the line refers to
|
||||
+ already exists, its access mode is left in place unmodified.</para>
|
||||
</refsect2>
|
||||
|
||||
<refsect2>
|
||||
@@ -515,6 +520,11 @@ r! /tmp/.X[0-9]*-lock</programlisting>
|
||||
<varname>r</varname>, <varname>R</varname>,
|
||||
<varname>L</varname>, <varname>t</varname>, and
|
||||
<varname>a</varname> lines.</para>
|
||||
+
|
||||
+ <para>By default the ownership of listed inodes is set to the specified user/group regardless if it is
|
||||
+ created anew, or already existed. Optionally, if prefixed with <literal>:</literal>, the configured
|
||||
+ user/group information is only applied when creating new inodes, and if the inode the line refers to
|
||||
+ already exists, its user/group is left in place unmodified.</para>
|
||||
</refsect2>
|
||||
|
||||
<refsect2>
|
||||
@ -0,0 +1,34 @@
|
||||
From f94b6151997df8a74b5931324be4d50c7c1bf912 Mon Sep 17 00:00:00 2001
|
||||
From: Ludwig Nussel <ludwig.nussel@suse.de>
|
||||
Date: Tue, 15 Feb 2022 11:49:26 +0100
|
||||
Subject: [PATCH] Revert "man: fix description of --force in halt(8) (#7392)"
|
||||
|
||||
This reverts commit 5d9adb5b60b815b477ba9e6b19ef0fd7e1854a38.
|
||||
|
||||
(cherry picked from commit 4e076fc8852614823789c75a0487bf24de3fe9ec)
|
||||
|
||||
Resolves: RHEL-81056
|
||||
---
|
||||
man/halt.xml | 9 ++-------
|
||||
1 file changed, 2 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/man/halt.xml b/man/halt.xml
|
||||
index 19857cea84..f82ab19f5f 100644
|
||||
--- a/man/halt.xml
|
||||
+++ b/man/halt.xml
|
||||
@@ -88,13 +88,8 @@
|
||||
<term><option>-f</option></term>
|
||||
<term><option>--force</option></term>
|
||||
|
||||
- <listitem><para>Force immediate halt, power-off, or reboot. When
|
||||
- specified once, this results in an immediate but clean shutdown
|
||||
- by the system manager. When specified twice, this results in an
|
||||
- immediate shutdown without contacting the system manager. See the
|
||||
- description of <option>--force</option> in
|
||||
- <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
|
||||
- for more details.</para></listitem>
|
||||
+ <listitem><para>Force immediate halt, power-off, reboot. Do
|
||||
+ not contact the init system.</para></listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
@ -0,0 +1,34 @@
|
||||
From 559a9e5b910781b114684803bbc4ba021c113edd Mon Sep 17 00:00:00 2001
|
||||
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
||||
Date: Sat, 17 Sep 2022 01:25:44 +0900
|
||||
Subject: [PATCH] man: explicitly document that "reboot -f" is different from
|
||||
"systemctl reboot -f"
|
||||
|
||||
Closes #24696.
|
||||
|
||||
(cherry picked from commit cb19517490104553907bb0b118cd2005d6e379cc)
|
||||
|
||||
Resolves: RHEL-81056
|
||||
---
|
||||
man/halt.xml | 8 ++++++--
|
||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/man/halt.xml b/man/halt.xml
|
||||
index f82ab19f5f..23bebb32b4 100644
|
||||
--- a/man/halt.xml
|
||||
+++ b/man/halt.xml
|
||||
@@ -88,8 +88,12 @@
|
||||
<term><option>-f</option></term>
|
||||
<term><option>--force</option></term>
|
||||
|
||||
- <listitem><para>Force immediate halt, power-off, reboot. Do
|
||||
- not contact the init system.</para></listitem>
|
||||
+ <listitem>
|
||||
+ <para>Force immediate halt, power-off, reboot. If specified, the command does not contact the init
|
||||
+ system. In most cases, filesystems are not properly unmounted before shutdown. For example, the
|
||||
+ command <command>reboot -f</command> is mostly equivalent to <command>systemctl reboot -ff</command>,
|
||||
+ instead of <command>systemctl reboot -f</command>.</para>
|
||||
+ </listitem>
|
||||
</varlistentry>
|
||||
|
||||
<varlistentry>
|
||||
10
systemd.spec
10
systemd.spec
@ -13,7 +13,7 @@
|
||||
Name: systemd
|
||||
Url: http://www.freedesktop.org/wiki/Software/systemd
|
||||
Version: 239
|
||||
Release: 82%{?dist}.4
|
||||
Release: 82%{?dist}.5
|
||||
# For a breakdown of the licensing, see README
|
||||
License: LGPLv2+ and MIT and GPLv2+
|
||||
Summary: System and Service Manager
|
||||
@ -1072,6 +1072,9 @@ Patch1019: 1019-logind-don-t-setup-idle-session-watch-for-lock-scree.patch
|
||||
Patch1020: 1020-logind-tighten-for-which-classes-of-sessions-we-do-s.patch
|
||||
Patch1021: 1021-ci-point-C8S-containers-to-the-Vault.patch
|
||||
Patch1022: 1022-core-fix-member-access-within-null-pointer.patch
|
||||
Patch1023: 1023-man-be-even-clearer-that-tmpfiles-user-group-mode-ar.patch
|
||||
Patch1024: 1024-Revert-man-fix-description-of-force-in-halt-8-7392.patch
|
||||
Patch1025: 1025-man-explicitly-document-that-reboot-f-is-different-f.patch
|
||||
|
||||
%ifarch %{ix86} x86_64 aarch64
|
||||
%global have_gnu_efi 1
|
||||
@ -1698,6 +1701,11 @@ fi
|
||||
%files tests -f .file-list-tests
|
||||
|
||||
%changelog
|
||||
* Wed Mar 05 2025 systemd maintenance team <systemd-maint@redhat.com> - 239-82.5
|
||||
- man: be even clearer that tmpfiles user/group/mode are applied on existing inodes (RHEL-77145)
|
||||
- Revert "man: fix description of --force in halt(8) (#7392)" (RHEL-81056)
|
||||
- man: explicitly document that "reboot -f" is different from "systemctl reboot -f" (RHEL-81056)
|
||||
|
||||
* Tue Jan 28 2025 systemd maintenance team <systemd-maint@redhat.com> - 239-82.4
|
||||
- core: fix member access within null pointer (RHEL-76308)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user