[packages/systemd] up to 254 (last major release to support split-usr and unmerged-usr)
atler
atler at pld-linux.org
Thu Aug 3 15:22:41 CEST 2023
commit 5003d836a2693c1751cd5813ca8737fe77e681e6
Author: Jan Palus <atler at pld-linux.org>
Date: Thu Aug 3 14:32:42 2023 +0200
up to 254 (last major release to support split-usr and unmerged-usr)
net-rename-revert.patch | 6 ++--
pld-boot_efi_mount.patch | 90 ++++++++++++++++++++++++++++++++++++++++------
pld-pam-systemd-user.patch | 3 +-
systemd-completion.patch | 4 +--
systemd-configfs.patch | 20 +++++------
systemd.spec | 51 +++++++++++++++++++-------
target-pld.patch | 37 ++++++++++---------
tmpfiles-not-fatal.patch | 16 ++++-----
udev-ploop-rules.patch | 4 +--
9 files changed, 166 insertions(+), 65 deletions(-)
---
diff --git a/systemd.spec b/systemd.spec
index 51671bd..9460129 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -32,14 +32,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: 253.7
-Release: 1
+Version: 254
+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: 08469f585a4c825957051978df079b1a
+# Source0-md5: 5d72697237ad9b4ece31ed0c558fc125
Source1: %{name}-sysv-convert
Source2: %{name}_booted.c
Source3: network.service
@@ -126,14 +126,14 @@ BuildRequires: libgpg-error-devel >= 1.12
BuildRequires: libidn2-devel
%{?with_microhttpd:BuildRequires: libmicrohttpd-devel >= 0.9.33}
BuildRequires: libmount-devel >= 2.30
-BuildRequires: libpwquality-devel
+BuildRequires: libpwquality-devel >= 1.4.1
BuildRequires: libseccomp-devel >= 2.4.0
%{?with_selinux:BuildRequires: libselinux-devel >= 2.6}
BuildRequires: libtool >= 2:2.2
BuildRequires: libxslt-progs
BuildRequires: lz4-devel >= 1:1.3.0
BuildRequires: m4
-BuildRequires: meson >= 0.53.2
+BuildRequires: meson >= 0.60.0
BuildRequires: ninja
BuildRequires: openssl-devel
BuildRequires: p11-kit-devel >= 0.23.3
@@ -144,6 +144,7 @@ BuildRequires: pld-release
BuildRequires: pkgconfig >= 1:0.9.0
BuildRequires: polkit-devel >= 0.106
BuildRequires: python3 >= 1:3.9
+%{?with_efi:BuildRequires: python3-elftools}
BuildRequires: python3-jinja2
BuildRequires: python3-lxml
%{?with_qrencode:BuildRequires: qrencode-devel >= 3}
@@ -192,7 +193,7 @@ Suggests: %{name}-sysv-compat = %{epoch}:%{version}-%{release}
Suggests: fsck >= 2.25.0
%{?with_fido2:Suggests: libfido2}
Suggests: libidn2
-Suggests: libpwquality
+Suggests: libpwquality >= 1.4.1
Suggests: pcre2-8
%{?with_qrencode:Suggests: qrencode-libs >= 3}
Suggests: service(klogd)
@@ -831,7 +832,9 @@ cp -p %{SOURCE2} src/systemd_booted.c
grep -rlZ -0 '#!/usr/bin/env bash' . | xargs -0 sed -i -e 's,#!/usr/bin/env bash,#!/bin/bash,g'
-%{__sed} -i -e '1 s,#!.*env python3,#!%{__python3},' src/ukify/ukify.py
+%{__sed} -i -e '1 s,#!.*env python3,#!%{__python3},' \
+ src/ukify/ukify.py \
+ src/kernel-install/60-ukify.install.in
%build
%meson build \
@@ -1319,6 +1322,7 @@ fi
%attr(755,root,root) /bin/loginctl
%attr(755,root,root) /bin/systemd
%attr(755,root,root) /bin/systemd-ask-password
+%attr(755,root,root) /bin/systemd-confext
%attr(755,root,root) /bin/systemd-creds
%attr(755,root,root) /bin/systemd-escape
%attr(755,root,root) /bin/systemd-firstboot
@@ -1354,6 +1358,7 @@ fi
/lib/systemd/resolv.conf
%attr(755,root,root) /lib/systemd/pld-clean-tmp
%attr(755,root,root) /lib/systemd/systemd-backlight
+%attr(755,root,root) /lib/systemd/systemd-battery-check
%attr(755,root,root) /lib/systemd/systemd-binfmt
%{?with_efi:%attr(755,root,root) /lib/systemd/systemd-bless-boot}
%attr(755,root,root) /lib/systemd/systemd-boot-check-no-failures
@@ -1430,24 +1435,25 @@ fi
%dir %{_prefix}/lib/kernel
%dir %{_prefix}/lib/kernel/install.d
%{_prefix}/lib/kernel/install.d/50-depmod.install
+%{_prefix}/lib/kernel/install.d/60-ukify.install
%{_prefix}/lib/kernel/install.d/90-loaderentry.install
%{_prefix}/lib/kernel/install.d/90-uki-copy.install
%if %{with efi}
%dir %{_prefix}/lib/systemd/boot
%dir %{_prefix}/lib/systemd/boot/efi
%ifarch %{ix86}
+%{_prefix}/lib/systemd/boot/efi/addonia32.efi.stub
%{_prefix}/lib/systemd/boot/efi/linuxia32.efi.stub
-%{_prefix}/lib/systemd/boot/efi/linuxia32.elf.stub
%{_prefix}/lib/systemd/boot/efi/systemd-bootia32.efi
%endif
%ifarch %{x8664} x32
+%{_prefix}/lib/systemd/boot/efi/addonx64.efi.stub
%{_prefix}/lib/systemd/boot/efi/linuxx64.efi.stub
-%{_prefix}/lib/systemd/boot/efi/linuxx64.elf.stub
%{_prefix}/lib/systemd/boot/efi/systemd-bootx64.efi
%endif
%ifarch aarch64
+%{_prefix}/lib/systemd/boot/efi/addonaa64.efi.stub
%{_prefix}/lib/systemd/boot/efi/linuxaa64.efi.stub
-%{_prefix}/lib/systemd/boot/efi/linuxaa64.elf.stub
%{_prefix}/lib/systemd/boot/efi/systemd-bootaa64.efi
%endif
%endif
@@ -1515,6 +1521,7 @@ fi
%{_datadir}/factory/etc/nsswitch.conf
%{_datadir}/factory/etc/pam.d/other
%{_datadir}/factory/etc/pam.d/system-auth
+%{_datadir}/factory/etc/vconsole.conf
%{?with_efi:%{_mandir}/man1/bootctl.1*}
%{_mandir}/man1/busctl.1*
%{_mandir}/man1/coredumpctl.1*
@@ -1610,6 +1617,7 @@ fi
%{_mandir}/man7/systemd-boot.7*
%{_mandir}/man7/systemd-stub.7*
%endif
+%{_mandir}/man7/smbios-type-11.7*
%{_mandir}/man7/systemd.directives.7*
%{_mandir}/man7/systemd.environment-generator.7*
%{_mandir}/man7/systemd.generator.7*
@@ -1626,12 +1634,14 @@ fi
%{_mandir}/man8/nss-myhostname.8*
%{_mandir}/man8/nss-mymachines.8*
%{_mandir}/man8/systemd-backlight.8*
+%{_mandir}/man8/systemd-battery-check.8*
%{_mandir}/man8/systemd-binfmt.8*
%if %{with efi}
%{_mandir}/man8/systemd-bless-boot.8*
%{_mandir}/man8/systemd-bless-boot-generator.8*
%endif
%{_mandir}/man8/systemd-boot-check-no-failures.8*
+%{_mandir}/man8/systemd-confext.8*
%{_mandir}/man8/systemd-coredump.8*
%if %{with cryptsetup}
%{_mandir}/man8/systemd-cryptsetup-generator.8*
@@ -1648,7 +1658,7 @@ fi
%{_mandir}/man8/systemd-growfs at .service.8*
%{_mandir}/man8/systemd-hibernate-resume-generator.8*
%{_mandir}/man8/systemd-hibernate-resume.8*
-%{_mandir}/man8/systemd-hibernate-resume at .service.8*
+%{_mandir}/man8/systemd-hibernate-resume.service.8*
%{_mandir}/man8/systemd-hostnamed.8*
%{_mandir}/man8/systemd-initctl.8*
%{_mandir}/man8/systemd-journald-dev-log.socket.8*
@@ -1863,6 +1873,7 @@ fi
%{systemdunitdir}/systemd-ask-password-console.service
%{systemdunitdir}/systemd-ask-password-wall.service
%{systemdunitdir}/systemd-backlight at .service
+%{systemdunitdir}/systemd-battery-check.service
%{systemdunitdir}/systemd-binfmt.service
%if %{with efi}
%{systemdunitdir}/systemd-bless-boot.service
@@ -1870,13 +1881,13 @@ fi
%{systemdunitdir}/systemd-boot-update.service
%endif
%{systemdunitdir}/systemd-boot-check-no-failures.service
+%{systemdunitdir}/systemd-confext.service
%{systemdunitdir}/systemd-firstboot.service
%{systemdunitdir}/systemd-fsck-root.service
%{systemdunitdir}/systemd-fsck at .service
%{systemdunitdir}/systemd-growfs-root.service
%{systemdunitdir}/systemd-growfs at .service
%{systemdunitdir}/systemd-halt.service
-%{systemdunitdir}/systemd-hibernate-resume at .service
%{systemdunitdir}/systemd-hibernate.service
%{systemdunitdir}/systemd-hostnamed.service
%{systemdunitdir}/systemd-hwdb-update.service
@@ -1906,6 +1917,7 @@ fi
%{systemdunitdir}/systemd-reboot.service
%{systemdunitdir}/systemd-remount-fs.service
%{systemdunitdir}/systemd-rfkill.service
+%{systemdunitdir}/systemd-soft-reboot.service
%{systemdunitdir}/systemd-suspend.service
%{systemdunitdir}/systemd-suspend-then-hibernate.service
%{systemdunitdir}/systemd-sysctl.service
@@ -1960,6 +1972,7 @@ fi
%{systemdunitdir}/cryptsetup.target
%{systemdunitdir}/integritysetup-pre.target
%{systemdunitdir}/integritysetup.target
+%{systemdunitdir}/system-systemd\x2dveritysetup.slice
%{systemdunitdir}/veritysetup-pre.target
%{systemdunitdir}/veritysetup.target
%endif
@@ -2015,6 +2028,7 @@ fi
%{systemdunitdir}/slices.target
%{systemdunitdir}/smartcard.target
%{systemdunitdir}/sockets.target
+%{systemdunitdir}/soft-reboot.target
%{systemdunitdir}/sound.target
%{systemdunitdir}/suspend.target
%{systemdunitdir}/swap.target
@@ -2056,6 +2070,7 @@ fi
%endif
%{systemdunitdir}/graphical.target.wants/display-manager.service
%{systemdunitdir}/graphical.target.wants/systemd-update-utmp-runlevel.service
+%{systemdunitdir}/initrd.target.wants/systemd-battery-check.service
%if %{with efi} && %{with tpm2}
%{systemdunitdir}/initrd.target.wants/systemd-pcrphase-initrd.service
%endif
@@ -2125,10 +2140,12 @@ fi
%{_mandir}/man8/systemd-ask-password-wall.path.8*
%{_mandir}/man8/systemd-ask-password-wall.service.8*
%{_mandir}/man8/systemd-backlight at .service.8*
+%{_mandir}/man8/systemd-battery-check.service.8*
%{_mandir}/man8/systemd-binfmt.service.8*
%{?with_efi:%{_mandir}/man8/systemd-bless-boot.service.8*}
%{_mandir}/man8/systemd-boot-check-no-failures.service.8*
%{?with_efi:%{_mandir}/man8/systemd-boot-random-seed.service.8*}
+%{_mandir}/man8/systemd-confext.service.8*
%{_mandir}/man8/systemd-coredump.socket.8*
%{_mandir}/man8/systemd-coredump at .service.8*
%if %{with cryptsetup}
@@ -2167,6 +2184,7 @@ fi
%{_mandir}/man8/systemd-reboot.service.8*
%{_mandir}/man8/systemd-remount-fs.service.8*
%{_mandir}/man8/systemd-rfkill.socket.8*
+%{_mandir}/man8/systemd-soft-reboot.service.8*
%{_mandir}/man8/systemd-suspend.service.8*
%{_mandir}/man8/systemd-suspend-then-hibernate.service.8*
%{_mandir}/man8/systemd-sysctl.service.8*
@@ -2205,6 +2223,7 @@ fi
%attr(755,root,root) /lib/systemd/systemd-pull
%attr(755,root,root) /lib/systemd/systemd-importd
%attr(755,root,root) %{_bindir}/systemd-dissect
+%attr(755,root,root) /sbin/mount.ddi
%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service
%{_datadir}/dbus-1/interfaces/org.freedesktop.import1.*.xml
@@ -2214,8 +2233,10 @@ fi
%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy
%{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy
%{_mandir}/man1/machinectl.1*
+%{_mandir}/man1/mount.ddi.1*
%{_mandir}/man5/org.freedesktop.import1.5*
%{_mandir}/man5/org.freedesktop.machine1.5*
+%{_mandir}/man7/systemd.image-policy.7*
%{_mandir}/man8/systemd-importd.8*
%{_mandir}/man8/systemd-importd.service.8*
%{_mandir}/man8/systemd-machined.8*
@@ -2455,6 +2476,7 @@ fi
%{_pkgconfigdir}/libsystemd.pc
%{_npkgconfigdir}/systemd.pc
%{_mandir}/man3/SD_*.3*
+%{_mandir}/man3/libsystemd.3*
%{_mandir}/man3/sd*.3*
%files -n bash-completion-systemd
@@ -2536,6 +2558,7 @@ fi
%attr(755,root,root) /lib/udev/cdrom_id
%attr(755,root,root) /lib/udev/dmi_memory_id
%attr(755,root,root) /lib/udev/fido_id
+%attr(755,root,root) /lib/udev/iocost
%attr(755,root,root) /lib/udev/mtd_probe
%attr(755,root,root) /lib/udev/scsi_id
%attr(755,root,root) /lib/udev/v4l_id
@@ -2586,6 +2609,7 @@ fi
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/modprobe.d/fbdev-blacklist.conf
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/modprobe.d/udev_blacklist.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/iocost.conf
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/links.conf
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/40-alsa-restore.rules
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/70-udev-pld.rules
@@ -2604,6 +2628,7 @@ fi
/lib/udev/rules.d/60-autosuspend.rules
/lib/udev/rules.d/60-block.rules
/lib/udev/rules.d/60-cdrom_id.rules
+/lib/udev/rules.d/60-dmi-id.rules
/lib/udev/rules.d/60-drm.rules
/lib/udev/rules.d/60-evdev.rules
/lib/udev/rules.d/60-fido-id.rules
@@ -2632,8 +2657,10 @@ fi
/lib/udev/rules.d/80-drivers.rules
/lib/udev/rules.d/80-net-setup-link.rules
/lib/udev/rules.d/81-net-dhcp.rules
+/lib/udev/rules.d/90-iocost.rules
/lib/udev/rules.d/90-vconsole.rules
+%{_mandir}/man5/iocost.conf.5*
%{_mandir}/man5/udev.conf.5*
%{_mandir}/man7/udev.7*
%{_mandir}/man7/hwdb.7*
diff --git a/net-rename-revert.patch b/net-rename-revert.patch
index f2cd69a..f993272 100644
--- a/net-rename-revert.patch
+++ b/net-rename-revert.patch
@@ -20,14 +20,14 @@ generated names. Re-apply this old hack to make the renaming less likely to fail
@@ -861,6 +863,32 @@
}
- r = rtnl_set_link_name(&event->rtnl, ifindex, event->name);
+ r = rtnl_set_link_name(&event->rtnl, ifindex, event->name, event->altnames);
+ /* keep trying if the destination interface name already exists */
+ if (r != -EEXIST)
+ goto out;
+
+ /* free our own name, another process may wait for us */
+ snprintf(name, IFNAMSIZ, "rename%d", ifindex);
-+ r = rtnl_set_link_name(&event->rtnl, ifindex, name);
++ r = rtnl_set_link_name(&event->rtnl, ifindex, name, NULL);
+ if (r < 0)
+ goto out;
+
@@ -42,7 +42,7 @@ generated names. Re-apply this old hack to make the renaming less likely to fail
+
+ nanosleep(&duration, NULL);
+
-+ r = rtnl_set_link_name(&event->rtnl, ifindex, name);
++ r = rtnl_set_link_name(&event->rtnl, ifindex, name, NULL);
+ if (r != -EEXIST)
+ goto out;
+ }
diff --git a/pld-boot_efi_mount.patch b/pld-boot_efi_mount.patch
index a4c4f67..d60b7bb 100644
--- a/pld-boot_efi_mount.patch
+++ b/pld-boot_efi_mount.patch
@@ -1,11 +1,81 @@
---- systemd-242/src/gpt-auto-generator/gpt-auto-generator.c.orig 2019-04-11 19:40:01.816893823 +0200
-+++ systemd-242/src/gpt-auto-generator/gpt-auto-generator.c 2019-04-11 19:42:53.022916795 +0200
-@@ -438,7 +438,7 @@
-
- /* Use /boot as fallback, but only if there's no XBOOTLDR partition */
- if (!has_xbootldr) {
-- esp_path = "/boot";
-+ esp_path = "/boot/efi";
- id = "boot";
- }
+--- systemd-stable-254/src/gpt-auto-generator/gpt-auto-generator.c.orig 2023-08-03 00:38:39.944343809 +0200
++++ systemd-stable-254/src/gpt-auto-generator/gpt-auto-generator.c 2023-08-03 12:11:02.082294800 +0200
+@@ -487,6 +487,18 @@
+ return cache;
+ }
+
++static int slash_boot_efi_in_fstab(void) {
++ static int cache = -1;
++
++ if (cache >= 0)
++ return cache;
++
++ cache = fstab_is_mount_point("/boot/efi");
++ if (cache < 0)
++ return log_error_errno(cache, "Failed to parse fstab: %m");
++ return cache;
++}
++
+ static int slash_efi_in_fstab(void) {
+ static int cache = -1;
+
+@@ -514,6 +526,21 @@
+ return (cache = false);
+ }
+
++static bool slash_boot_efi_exists(void) {
++ static int cache = -1;
++
++ if (cache >= 0)
++ return cache;
++
++ if (access("/boot/efi", F_OK) >= 0)
++ return (cache = true);
++ if (errno != ENOENT)
++ log_error_errno(errno, "Failed to determine whether /boot/efi exists, assuming no: %m");
++ else
++ log_debug_errno(errno, "/boot/efi: %m");
++ return (cache = false);
++}
++
+ static int add_partition_xbootldr(DissectedPartition *p) {
+ _cleanup_free_ char *options = NULL;
+ int r;
+@@ -574,29 +601,29 @@
+ return 0;
}
+
+- /* If /boot/ is present, unused, and empty, we'll take that.
++ /* If /boot/efi is present, unused, and empty, we'll take that.
+ * Otherwise, if /efi/ is unused and empty (or missing), we'll take that.
+ * Otherwise, we do nothing.
+ */
+- if (!has_xbootldr && slash_boot_exists()) {
+- r = slash_boot_in_fstab();
++ if (!has_xbootldr && slash_boot_efi_exists()) {
++ r = slash_boot_efi_in_fstab();
+ if (r < 0)
+ return r;
+ if (r == 0) {
+- r = path_is_busy("/boot");
++ r = path_is_busy("/boot/efi");
+ if (r < 0)
+ return r;
+ if (r == 0) {
+- esp_path = "/boot";
++ esp_path = "/boot/efi";
+ id = "boot";
+ }
+ } else {
+- /* Check if the fstab entry for /boot/ is already the ESP. If so, we don't need to
++ /* Check if the fstab entry for /boot/efi is already the ESP. If so, we don't need to
+ * check /efi/ or duplicate the mount there. */
+- r = fstab_is_mount_point_full("/boot", p->node);
++ r = fstab_is_mount_point_full("/boot/efi", p->node);
+ if (r < 0)
+ return log_error_errno(r,
+- "Failed to check if fstab entry for /boot uses the same device as '%s': %m",
++ "Failed to check if fstab entry for /boot/efi uses the same device as '%s': %m",
+ p->node);
+ if (r > 0)
+ return 0;
diff --git a/pld-pam-systemd-user.patch b/pld-pam-systemd-user.patch
index c90e10a..3a69a54 100644
--- a/pld-pam-systemd-user.patch
+++ b/pld-pam-systemd-user.patch
@@ -1,6 +1,6 @@
--- systemd-stable-249/src/login/systemd-user.in.orig 2021-07-07 19:41:29.000000000 +0200
+++ systemd-stable-249/src/login/systemd-user.in 2021-07-07 22:39:21.502935327 +0200
-@@ -2,20 +2,11 @@
+@@ -2,21 +2,11 @@
#
# Used by systemd --user instances.
@@ -23,6 +23,7 @@
+session optional pam_selinux.so close
+session optional pam_selinux.so nottys open
{% endif %}
+-session optional pam_umask.so silent
-session optional pam_systemd.so
+session required pam_loginuid.so
+session required pam_namespace.so
diff --git a/systemd-completion.patch b/systemd-completion.patch
index 23c7486..f49847f 100644
--- a/systemd-completion.patch
+++ b/systemd-completion.patch
@@ -5,7 +5,7 @@ diff -urN systemd-241.orig/shell-completion/bash/meson.build systemd-241/shell-c
['systemd-path', ''],
['systemd-run', ''],
['udevadm', ''],
-- ['bootctl', 'HAVE_GNU_EFI'],
+- ['bootctl', 'ENABLE_BOOTLOADER'],
+ ['bootctl', ''],
['coredumpctl', 'ENABLE_COREDUMP'],
['homectl', 'ENABLE_HOMED'],
@@ -17,7 +17,7 @@ diff -urN systemd-241.orig/shell-completion/zsh/meson.build systemd-241/shell-co
['_sd_outputmodes', ''],
['_sd_unit_files', ''],
['_sd_machines', ''],
-- ['_bootctl', 'HAVE_GNU_EFI'],
+- ['_bootctl', 'ENABLE_BOOTLOADER'],
+ ['_bootctl', ''],
['_coredumpctl', 'ENABLE_COREDUMP'],
['_hostnamectl', 'ENABLE_HOSTNAMED'],
diff --git a/systemd-configfs.patch b/systemd-configfs.patch
index 1fe11c8..fb50264 100644
--- a/systemd-configfs.patch
+++ b/systemd-configfs.patch
@@ -1,13 +1,13 @@
---- systemd-235/units/meson.build.org 2017-10-21 15:20:03.280741248 +0200
-+++ systemd-235/units/meson.build 2017-10-21 15:20:23.741288778 +0200
-@@ -76,6 +76,7 @@ units = [
- 'sysinit.target.wants/'],
- ['sys-kernel-config.mount', '',
- 'sysinit.target.wants/'],
-+ ['sys-kernel-config.service', ''],
- ['sys-kernel-debug.mount', '',
- 'sysinit.target.wants/'],
- ['sys-kernel-tracing.mount', '',
+--- systemd-stable-254/units/meson.build.orig 2023-08-03 00:34:19.694943339 +0200
++++ systemd-stable-254/units/meson.build 2023-08-03 00:37:00.467127234 +0200
+@@ -208,6 +208,7 @@
+ 'file' : 'sys-kernel-config.mount',
+ 'symlinks' : ['sysinit.target.wants/'],
+ },
++ { 'file' : 'sys-kernel-config.service' },
+ {
+ 'file' : 'sys-kernel-debug.mount',
+ 'symlinks' : ['sysinit.target.wants/'],
diff -durN -x '*.orig' systemd-208.orig/units/sys-kernel-config.mount systemd-208/units/sys-kernel-config.mount
--- systemd-208.orig/units/sys-kernel-config.mount 2013-08-13 22:02:52.000000000 +0200
+++ systemd-208/units/sys-kernel-config.mount 2014-01-10 10:22:04.000000000 +0100
diff --git a/target-pld.patch b/target-pld.patch
index aff2adb..6c0962c 100644
--- a/target-pld.patch
+++ b/target-pld.patch
@@ -112,23 +112,26 @@
if (!timezone_is_valid(e, LOG_DEBUG))
return -EINVAL;
---- systemd-240.orig/src/vconsole/vconsole-setup.c 2013-08-13 22:02:47.000000000 +0200
-+++ systemd-240/src/vconsole/vconsole-setup.c 2014-01-09 15:17:49.000000000 +0100
-@@ -284,6 +284,17 @@ int main(int argc, char **argv) {
- if (r < 0 && r != -ENOENT)
- log_warning_errno(r, "Failed to read /etc/vconsole.conf, ignoring: %m");
-
-+ if (r < 0) {
+--- systemd-stable-254/src/vconsole/vconsole-setup.c.orig 2023-08-02 23:51:41.833676408 +0200
++++ systemd-stable-254/src/vconsole/vconsole-setup.c 2023-08-03 00:00:16.025707038 +0200
+@@ -141,7 +141,19 @@
+ if (r < 0) {
+ if (r != -ENOENT)
+ log_warning_errno(r, "Failed to read /etc/vconsole.conf, ignoring: %m");
+- return r;
++
+ int r1 = parse_env_file(NULL, "/etc/sysconfig/console"
-+ "CONSOLEFONT", &vc_font,
-+ "CONSOLEMAP", &vc_font_map,
-+ "CONSOLESCREENFONTMAP", &vc_font_unimap,
-+ "KEYTABLE", &vc_keymap
++ "CONSOLEFONT", &v.config[VC_FONT],
++ "CONSOLEMAP", &v.config[VC_FONT_MAP],
++ "CONSOLESCREENFONTMAP", &v.config[VC_FONT_UNIMAP],
++ "KEYTABLE", &v.config[VC_KEYMAP]
+ );
-+ if (r1 < 0 && r1 != -ENOENT)
-+ log_warning_errno(r1, "Failed to read /etc/sysconfig/console: %m");
-+ }
++ if (r1 < 0) {
++ if (r1 != -ENOENT)
++ log_warning_errno(r1, "Failed to read /etc/sysconfig/console, ignoring: %m");
++ return r1;
++ }
+
- /* Let the kernel command line override /etc/vconsole.conf (highest priority) */
- r = proc_cmdline_get_key_many(
- PROC_CMDLINE_STRIP_RD_PREFIX,
+ }
+
+ context_merge_config(c, &v, NULL);
diff --git a/tmpfiles-not-fatal.patch b/tmpfiles-not-fatal.patch
index df599ac..0231c5b 100644
--- a/tmpfiles-not-fatal.patch
+++ b/tmpfiles-not-fatal.patch
@@ -9,7 +9,7 @@ diff -ur systemd-245/units.org/systemd-tmpfiles-clean.service systemd-245/units/
+ExecStart=-systemd-tmpfiles --clean
SuccessExitStatus=DATAERR
IOSchedulingClass=idle
- LoadCredential=tmpfiles.extra
+ ImportCredential=tmpfiles.*
diff -ur systemd-245/units.org/systemd-tmpfiles-setup-dev.service systemd-245/units/systemd-tmpfiles-setup-dev.service
--- systemd-245/units.org/systemd-tmpfiles-setup-dev.service 2020-03-06 13:38:52.000000000 +0100
+++ systemd-245/units/systemd-tmpfiles-setup-dev.service 2020-04-03 21:08:42.151365700 +0200
@@ -17,10 +17,10 @@ diff -ur systemd-245/units.org/systemd-tmpfiles-setup-dev.service systemd-245/un
[Service]
Type=oneshot
RemainAfterExit=yes
--ExecStart=systemd-tmpfiles --prefix=/dev --create --boot
-+ExecStart=-systemd-tmpfiles --prefix=/dev --create --boot
+-ExecStart=systemd-tmpfiles --prefix=/dev --create --boot --graceful
++ExecStart=-systemd-tmpfiles --prefix=/dev --create --boot --graceful
SuccessExitStatus=DATAERR CANTCREAT
- LoadCredential=tmpfiles.extra
+ ImportCredential=tmpfiles.*
diff -ur systemd-245/units.org/systemd-tmpfiles-setup.service systemd-245/units/systemd-tmpfiles-setup.service
--- systemd-245/units.org/systemd-tmpfiles-setup.service 2020-03-06 13:38:52.000000000 +0100
+++ systemd-245/units/systemd-tmpfiles-setup.service 2020-04-03 21:08:42.151365700 +0200
@@ -28,11 +28,11 @@ diff -ur systemd-245/units.org/systemd-tmpfiles-setup.service systemd-245/units/
[Service]
Type=oneshot
RemainAfterExit=yes
--ExecStart=systemd-tmpfiles --create --remove --boot --exclude-prefix=/dev
-+ExecStart=-systemd-tmpfiles --create --remove --boot --exclude-prefix=/dev
+-ExecStart=systemd-tmpfiles --create --remove --boot
++ExecStart=-systemd-tmpfiles --create --remove --boot
SuccessExitStatus=DATAERR CANTCREAT
- LoadCredential=tmpfiles.extra
- LoadCredential=login.motd
+ ImportCredential=tmpfiles.*
+ ImportCredential=login.motd
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
diff --git a/udev-ploop-rules.patch b/udev-ploop-rules.patch
index 4c22d72..c1b2ba4 100644
--- a/udev-ploop-rules.patch
+++ b/udev-ploop-rules.patch
@@ -1,6 +1,6 @@
diff -ru udev-182.orig/rules/60-persistent-storage.rules udev-182/rules/60-persistent-storage.rules
---- 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
+--- udev-182.orig/rules.d/60-persistent-storage.rules.in 2012-02-23 16:26:16.000000000 +0100
++++ udev-182/rules.d/60-persistent-storage.rules.in 2012-05-24 11:23:01.000000000 +0200
@@ -16,6 +16,8 @@
SUBSYSTEM!="block|ubi", 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"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/systemd.git/commitdiff/5003d836a2693c1751cd5813ca8737fe77e681e6
More information about the pld-cvs-commit
mailing list