From 681ad19cb0eb68d983f1aafdfbf19268aecf0e3c Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Sun, 14 Mar 2021 14:12:53 +0100 Subject: [PATCH] up to 247.4 - rediffed patches --- config-pld.patch | 5 ++--- systemd-completion.patch | 2 +- systemd-configfs.patch | 4 ++-- systemd.spec | 4 ++-- target-pld.patch | 4 ++-- tmpfiles-not-fatal.patch | 3 ++- udev-ploop-rules.patch | 4 ++-- uids_gids.patch | 7 +++---- 8 files changed, 16 insertions(+), 17 deletions(-) diff --git a/config-pld.patch b/config-pld.patch index 849fce5..8a855e2 100644 --- a/config-pld.patch +++ b/config-pld.patch @@ -15,6 +15,5 @@ diff -dur systemd-218.orig/tmpfiles.d/legacy.conf systemd-218/tmpfiles.d/legacy. -d /run/lock/subsys 0755 root root - +d /run/lock/subsys 0700 root root - - # /run/lock/lockdev is used to serialize access to tty devices via - # LCK..xxx style lock files, For more information see: - + # /forcefsck, /fastboot and /forcequotacheck are deprecated in favor of the + # kernel command line options 'fsck.mode=force', 'fsck.mode=skip' and diff --git a/systemd-completion.patch b/systemd-completion.patch index da35d03..3c24beb 100644 --- a/systemd-completion.patch +++ b/systemd-completion.patch @@ -8,8 +8,8 @@ diff -urN systemd-241.orig/shell-completion/bash/meson.build systemd-241/shell-c - ['bootctl', 'ENABLE_EFI'], + ['bootctl', ''], ['coredumpctl', 'ENABLE_COREDUMP'], + ['homectl', 'ENABLE_HOMED'], ['hostnamectl', 'ENABLE_HOSTNAMED'], - ['localectl', 'ENABLE_LOCALED'], diff -urN systemd-241.orig/shell-completion/zsh/meson.build systemd-241/shell-completion/zsh/meson.build --- systemd-241.orig/shell-completion/zsh/meson.build 2019-02-14 11:11:58.000000000 +0100 +++ systemd-241/shell-completion/zsh/meson.build 2019-03-07 01:09:00.655641470 +0100 diff --git a/systemd-configfs.patch b/systemd-configfs.patch index 5064c95..b9b57f1 100644 --- a/systemd-configfs.patch +++ b/systemd-configfs.patch @@ -13,7 +13,7 @@ diff -durN -x '*.orig' systemd-208.orig/units/sys-kernel-config.mount systemd-20 +++ systemd-208/units/sys-kernel-config.mount 2014-01-10 10:22:04.000000000 +0100 @@ -10,8 +10,9 @@ Description=Configuration File System Documentation=https://www.kernel.org/doc/Documentation/filesystems/configfs/configfs.txt - Documentation=http://www.freedesktop.org/wiki/Software/systemd/APIFileSystems + Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems DefaultDependencies=no -ConditionPathExists=/sys/kernel/config ConditionCapability=CAP_SYS_RAWIO @@ -21,7 +21,7 @@ diff -durN -x '*.orig' systemd-208.orig/units/sys-kernel-config.mount systemd-20 +After=systemd-modules-load.service sys-kernel-config.service Before=sysinit.target - [Mount] + # These dependencies are used to make certain that the module is fully diff -durN -x '*.orig' systemd-208.orig/units/sys-kernel-config.service systemd-208/units/sys-kernel-config.service --- systemd-208.orig/units/sys-kernel-config.service 1970-01-01 01:00:00.000000000 +0100 +++ systemd-208/units/sys-kernel-config.service 2014-01-10 10:22:04.000000000 +0100 diff --git a/systemd.spec b/systemd.spec index df32b18..d5c0bba 100644 --- a/systemd.spec +++ b/systemd.spec @@ -28,14 +28,14 @@ Summary: A System and Service Manager Summary(pl.UTF-8): systemd - zarządca systemu i usług dla Linuksa Name: systemd # Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often) -Version: 247.3 +Version: 247.4 Release: 0.1 Epoch: 1 License: GPL v2+ (udev), LGPL v2.1+ (the rest) Group: Base #Source0Download: https://github.com/systemd/systemd/releases Source0: https://github.com/systemd/systemd-stable/archive/v%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 5be57c584847b161c67577f2d997903a +# Source0-md5: 995017324c6e47b4f57dc8a00a01727b Source1: %{name}-sysv-convert Source2: %{name}_booted.c Source3: network.service diff --git a/target-pld.patch b/target-pld.patch index 68758c1..d4962f8 100644 --- a/target-pld.patch +++ b/target-pld.patch @@ -126,5 +126,5 @@ + } + /* Let the kernel command line override /etc/vconsole.conf */ - if (detect_container(NULL) <= 0) { - r = parse_env_file(NULL, "/proc/cmdline", WHITESPACE, + r = proc_cmdline_get_key_many( + PROC_CMDLINE_STRIP_RD_PREFIX, diff --git a/tmpfiles-not-fatal.patch b/tmpfiles-not-fatal.patch index fb38337..5ef8d50 100644 --- a/tmpfiles-not-fatal.patch +++ b/tmpfiles-not-fatal.patch @@ -32,7 +32,7 @@ diff -ur systemd-245/units.org/systemd-tmpfiles-setup.service systemd-245/units/ diff -ur systemd-245/units.org/user/systemd-tmpfiles-clean.service systemd-245/units/user/systemd-tmpfiles-clean.service --- systemd-245/units.org/user/systemd-tmpfiles-clean.service 2020-03-06 13:38:52.000000000 +0100 +++ systemd-245/units/user/systemd-tmpfiles-clean.service 2020-04-03 21:08:42.151365700 +0200 -@@ -16,6 +16,6 @@ +@@ -16,7 +16,7 @@ [Service] Type=oneshot @@ -40,6 +40,7 @@ diff -ur systemd-245/units.org/user/systemd-tmpfiles-clean.service systemd-245/u +ExecStart=-systemd-tmpfiles --user --clean SuccessExitStatus=DATAERR IOSchedulingClass=idle + Slice=background.slice diff -ur systemd-245/units.org/user/systemd-tmpfiles-setup.service systemd-245/units/user/systemd-tmpfiles-setup.service --- systemd-245/units.org/user/systemd-tmpfiles-setup.service 2020-03-06 13:38:52.000000000 +0100 +++ systemd-245/units/user/systemd-tmpfiles-setup.service 2020-04-03 21:08:42.151365700 +0200 diff --git a/udev-ploop-rules.patch b/udev-ploop-rules.patch index e98ad0a..5c7ef9f 100644 --- a/udev-ploop-rules.patch +++ b/udev-ploop-rules.patch @@ -2,8 +2,8 @@ diff -ru udev-182.orig/rules/60-persistent-storage.rules udev-182/rules/60-persi --- udev-182.orig/rules.d/60-persistent-storage.rules 2012-02-23 16:26:16.000000000 +0100 +++ udev-182/rules.d/60-persistent-storage.rules 2012-05-24 11:23:01.000000000 +0200 @@ -16,6 +16,8 @@ - # skip rules for inappropriate block devices - KERNEL=="fd*|mtd*|nbd*|gnbd*|btibm*|dm-*|md*", GOTO="persistent_storage_end" + SUBSYSTEM!="block", GOTO="persistent_storage_end" + KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|ubi*|scm*|pmem*|nbd*|zd*", GOTO="persistent_storage_end" +KERNEL=="ploop*", GOTO="persistent_storage_end" + diff --git a/uids_gids.patch b/uids_gids.patch index d24000b..a5d2890 100644 --- a/uids_gids.patch +++ b/uids_gids.patch @@ -52,11 +52,10 @@ )m4_dnl --- systemd-238/sysusers.d/systemd.conf.m4~ 2018-03-05 23:16:37.000000000 +0100 +++ systemd-238/sysusers.d/systemd.conf.m4 2018-05-15 13:34:07.479084303 +0200 -@@ -5,6 +5,6 @@ - # (at your option) any later version. - +@@ -5,5 +5,5 @@ + u systemd-timesync - "systemd Time Synchronization" + )m4_dnl m4_ifdef(`ENABLE_COREDUMP', -u systemd-coredump - "systemd Core Dumper" +u systemd-coredump 333 "systemd Core Dumper" )m4_dnl - -- 2.44.0