[packages/systemd/systemd-259] - try 259 installed to /
baggins
baggins at pld-linux.org
Sun Jan 4 16:16:39 CET 2026
commit ebcc244aa99943ba1ffb47053a2bdf4173e98072
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Jan 4 17:15:42 2026 +0100
- try 259 installed to /
config-pld.patch | 14 ++++------
net-rename-revert.patch | 17 ++++++++++++
optional-tmp-on-tmpfs.patch | 2 +-
pld-boot_efi_mount.patch | 67 +++++++--------------------------------------
pld-pam-systemd-user.patch | 7 ++---
pld-sysv-network.patch | 6 ++--
rpm-macros.patch | 4 +--
systemd-completion.patch | 24 ----------------
systemd-configfs.patch | 2 +-
systemd-glibc.patch | 10 -------
systemd-x32.patch | 4 +--
systemd.spec | 45 ++++++++++++++----------------
target-pld.patch | 40 +++++++++++++--------------
udev-ploop-rules.patch | 2 +-
14 files changed, 87 insertions(+), 157 deletions(-)
---
diff --git a/systemd.spec b/systemd.spec
index 429abce..5e97158 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: 254.27
-Release: 2
+Version: 259
+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: bd8bbfe343b829b3ae2978b9603facde
+Source0: https://github.com/systemd/systemd/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 5c5e5c1c43d4ee5e5648e7ab118ac476
Source1: %{name}-sysv-convert
Source2: %{name}_booted.c
Source3: network.service
@@ -74,7 +74,6 @@ Patch3: tmpfiles-not-fatal.patch
Patch4: udev-ploop-rules.patch
Patch5: %{name}-split-usr-fix.patch
Patch6: net-rename-revert.patch
-Patch7: %{name}-completion.patch
Patch8: proc-hidepid.patch
Patch9: %{name}-configfs.patch
Patch10: pld-boot_efi_mount.patch
@@ -83,7 +82,6 @@ Patch13: sysctl.patch
Patch14: pld-pam-%{name}-user.patch
Patch15: %{name}-x32.patch
Patch16: rpm-macros.patch
-Patch17: %{name}-glibc.patch
URL: https://www.freedesktop.org/wiki/Software/systemd/
BuildRequires: acl-devel
%{?with_audit:BuildRequires: audit-libs-devel}
@@ -317,6 +315,7 @@ Conflicts: xl2tpd < 1.3.0-2
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _rootsbindir /sbin
+%define _prefix /
%description
systemd is a system and service manager for Linux, compatible with
@@ -809,16 +808,15 @@ RPM macros that define paths and scriptlets related to systemd.
Makra RPM-a definiujące ścieżki i skryptlety związane z systemd.
%prep
-%setup -q -n systemd-stable-%{version}
+%setup -q
%patch -P0 -p1
%patch -P1 -p1
%patch -P2 -p1
%patch -P3 -p1
%patch -P4 -p1
-%patch -P5 -p1
+#patch -P5 -p1
# rejected upstream (do not disable!)
%patch -P6 -p1
-%patch -P7 -p1
%patch -P8 -p1
%patch -P9 -p1
%patch -P10 -p1
@@ -827,7 +825,6 @@ Makra RPM-a definiujące ścieżki i skryptlety związane z systemd.
%patch -P14 -p1
%patch -P15 -p1
%patch -P16 -p1
-%patch -P17 -p1
cp -p %{SOURCE2} src/systemd_booted.c
@@ -837,6 +834,8 @@ grep -rlZ -0 '#!/usr/bin/env bash' . | xargs -0 sed -i -e 's,#!/usr/bin/env bash
src/ukify/ukify.py \
src/kernel-install/60-ukify.install.in
+%{__mv} test/fuzz/fuzz-unit-file/dm-back{\\x2d,-}slash.swap
+
%build
%meson \
-Dadm-gid=3 \
@@ -883,8 +882,6 @@ grep -rlZ -0 '#!/usr/bin/env bash' . | xargs -0 sed -i -e 's,#!/usr/bin/env bash
-Dquotacheck-path=/sbin/quotacheck \
-Dquotaon-path=/sbin/quotaon \
-Drc-local=/etc/rc.d/rc.local \
- -Drootlibdir=/%{_lib} \
- -Drootprefix="" \
-Dsbat-distro="%vendor" \
-Dsbat-distro-pkgname="%name" \
-Dsbat-distro-summary="%distribution" \
@@ -893,7 +890,6 @@ grep -rlZ -0 '#!/usr/bin/env bash' . | xargs -0 sed -i -e 's,#!/usr/bin/env bash
-Dselinux=%{__true_false selinux} \
-Dsetfont-path=/bin/setfont \
-Dsplit-bin=true \
- -Dsplit-usr=true \
-Dsulogin-path=/sbin/sulogin \
-Dsysvinit-path=/etc/rc.d/init.d \
-Dsysvrcnd-path=/etc/rc.d \
@@ -909,13 +905,14 @@ grep -rlZ -0 '#!/usr/bin/env bash' . | xargs -0 sed -i -e 's,#!/usr/bin/env bash
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/var/lib/{%{name}/{catalog,coredump},machines} \
- $RPM_BUILD_ROOT%{_rootsbindir} \
- $RPM_BUILD_ROOT%{_sysconfdir}/{modprobe.d,repart.d,systemd/{system,user}-preset,sysupdate.d} \
- $RPM_BUILD_ROOT%{systemduserunitdir}/{basic,sockets}.target.wants \
- $RPM_BUILD_ROOT%{systemdunitdir}/{final,sound,system-update}.target.wants \
- $RPM_BUILD_ROOT%{systemdunitdir}/systemd-udevd.service.d \
- $RPM_BUILD_ROOT%{_prefix}/lib/{repart.d,systemd/system-environment-generators,sysupdate.d}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/{modprobe.d,systemd/{system,user}-preset}
+#install -d $RPM_BUILD_ROOT/var/lib/{%{name}/{catalog,coredump},machines} \
+# $RPM_BUILD_ROOT%{_rootsbindir} \
+# $RPM_BUILD_ROOT%{_sysconfdir}/{modprobe.d,repart.d,systemd/{system,user}-preset,sysupdate.d} \
+# $RPM_BUILD_ROOT%{systemduserunitdir}/{basic,sockets}.target.wants \
+# $RPM_BUILD_ROOT%{systemdunitdir}/{final,sound,system-update}.target.wants \
+# $RPM_BUILD_ROOT%{systemdunitdir}/systemd-udevd.service.d \
+# $RPM_BUILD_ROOT%{_prefix}/lib/{repart.d,systemd/system-environment-generators,sysupdate.d}
%meson_install
@@ -925,19 +922,19 @@ install -p -m755 build/systemd_booted $RPM_BUILD_ROOT/bin/systemd_booted
# target-pld.patch supplements
%{__rm} $RPM_BUILD_ROOT%{systemdunitdir}/sysinit.target.wants/sys-kernel-config.mount
-ln -s %{systemdunitdir}/prefdm.service $RPM_BUILD_ROOT%{systemdunitdir}/graphical.target.wants/display-manager.service
-ln -s prefdm.service $RPM_BUILD_ROOT%{systemdunitdir}/display-manager.service
+#ln -s %{systemdunitdir}/prefdm.service $RPM_BUILD_ROOT%{systemdunitdir}/graphical.target.wants/display-manager.service
+#ln -s prefdm.service $RPM_BUILD_ROOT%{systemdunitdir}/display-manager.service
ln -s rescue.service $RPM_BUILD_ROOT%{systemdunitdir}/single.service
ln -s %{systemdunitdir}/rc-local.service $RPM_BUILD_ROOT%{systemdunitdir}/multi-user.target.wants/rc-local.service
# compatibility symlinks to udevd binary
-mv $RPM_BUILD_ROOT/lib/{systemd/systemd-,udev/}udevd
+%{__mv} $RPM_BUILD_ROOT/lib/{systemd/systemd-,udev/}udevd
ln -s /lib/udev/udevd $RPM_BUILD_ROOT/lib/systemd/systemd-udevd
ln -s /lib/udev/udevd $RPM_BUILD_ROOT%{_rootsbindir}/udevd
# compat symlinks for "/ merged into /usr" programs
ln -s ../bin/udevadm $RPM_BUILD_ROOT%{_rootsbindir}
-ln -s /lib/udev $RPM_BUILD_ROOT%{_prefix}/lib
+#ln -s /lib/udev $RPM_BUILD_ROOT%{_prefix}/lib
# install custom udev rules from pld package
cp -a %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/40-alsa-restore.rules
diff --git a/config-pld.patch b/config-pld.patch
index d1a8e75..3a8ce2e 100644
--- a/config-pld.patch
+++ b/config-pld.patch
@@ -1,20 +1,18 @@
--- systemd-stable-250/tmpfiles.d/legacy.conf.in.orig 2021-12-27 11:37:45.454887047 +0100
+++ systemd-stable-250/tmpfiles.d/legacy.conf.in 2021-12-27 11:39:02.180866644 +0100
@@ -10,7 +10,7 @@
- # These files are considered legacy and are unnecessary on legacy-free
- # systems.
+ # by newer interfaces. Their use is discouraged on legacy-free systems. This
+ # configuration is provided to maintain backward compatibility.
-d /run/lock 0755 root root -
+d /run/lock 1771 root root -
L /var/lock - - - - ../run/lock
{% if CREATE_LOG_DIRS %}
- L /var/log/README - - - - ../..{{DOC_DIR}}/README.logs
-@@ -19,7 +19,7 @@
+ L$ /var/log/README - - - - ../..{{DOC_DIR}}/README.logs
+@@ -19,5 +19,5 @@
+ {% if HAVE_SYSV_COMPAT %}
# /run/lock/subsys is used for serializing SysV service execution, and
# hence without use on SysV-less systems.
-
-d /run/lock/subsys 0755 root root -
+d /run/lock/subsys 0700 root root -
-
- # /forcefsck, /fastboot and /forcequotacheck are deprecated in favor of the
- # kernel command line options 'fsck.mode=force', 'fsck.mode=skip' and
+ {% endif %}
diff --git a/net-rename-revert.patch b/net-rename-revert.patch
index 8de05a6..8e6307f 100644
--- a/net-rename-revert.patch
+++ b/net-rename-revert.patch
@@ -8,6 +8,23 @@ generated names. Re-apply this old hack to make the renaming less likely to fail
--- systemd-stable-246.1/src/udev/udev-event.c.orig 2020-08-07 17:09:53.000000000 +0200
+++ systemd-stable-246.1/src/udev/udev-event.c 2020-08-15 11:04:10.263428290 +0200
+@@ -2,6 +2,8 @@
+
+ #include "sd-netlink.h"
+
++#include <linux/if.h>
++
+ #include "alloc-util.h"
+ #include "device-internal.h"
+ #include "device-private.h"
+@@ -15,6 +15,7 @@
+ #include "socket-util.h"
+ #include "string-util.h"
+ #include "strv.h"
++#include "strxcpyx.h"
+ #include "time-util.h"
+ #include "udev-event.h"
+ #include "udev-node.h"
@@ -820,6 +820,8 @@
const char *s;
sd_device *dev;
diff --git a/optional-tmp-on-tmpfs.patch b/optional-tmp-on-tmpfs.patch
index a699cfc..204ffa6 100644
--- a/optional-tmp-on-tmpfs.patch
+++ b/optional-tmp-on-tmpfs.patch
@@ -3,7 +3,7 @@
@@ -20,3 +20,6 @@ What=tmpfs
Where=/tmp
Type=tmpfs
- Options=mode=1777,strictatime,nosuid,nodev,size=50%%,nr_inodes=1m
+ Options=mode=1777,strictatime,nosuid,nodev,size=50%%,nr_inodes=1m,x-systemd.graceful-option=usrquota
+
+[Install]
+WantedBy=local-fs.target
diff --git a/pld-boot_efi_mount.patch b/pld-boot_efi_mount.patch
index 7ed2147..f766050 100644
--- a/pld-boot_efi_mount.patch
+++ b/pld-boot_efi_mount.patch
@@ -1,68 +1,21 @@
--- systemd-stable-254.1/src/gpt-auto-generator/gpt-auto-generator.c.orig 2023-08-09 22:33:59.978475054 +0200
+++ systemd-stable-254.1/src/gpt-auto-generator/gpt-auto-generator.c 2023-08-09 22:41:09.618936068 +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 add_partition_xbootldr(DissectedPartition *p) {
- _cleanup_free_ char *options = NULL;
- int r;
-@@ -562,6 +574,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_esp(DissectedPartition *p, bool has_xbootldr) {
- const char *esp_path = NULL, *id = NULL;
- _cleanup_free_ char *options = NULL;
-@@ -582,19 +609,19 @@
+@@ -582,15 +609,15 @@
if (r > 0)
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.
+- /* If XBOOTLDR partition is not present and /boot/ is unused and empty, we'll take that.
++ /* If XBOOTLDR partition is not present and /boot/efi/ is 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 (!has_xbootldr) {
+- r = path_is_busy("/boot");
++ r = path_is_busy("/boot/efi");
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";
- }
+- esp_path = "/boot";
++ esp_path = "/boot/efi";
+ id = "boot";
}
+ }
diff --git a/pld-pam-systemd-user.patch b/pld-pam-systemd-user.patch
index 3a69a54..501079f 100644
--- a/pld-pam-systemd-user.patch
+++ b/pld-pam-systemd-user.patch
@@ -1,14 +1,13 @@
--- 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,21 +2,11 @@
+@@ -2,20 +2,11 @@
#
# Used by systemd --user instances.
-{% if ENABLE_HOMED %}
---account sufficient pam_systemd_home.so
+--account [success=done authtok_expired=bad new_authtok_reqd=bad maxtries=bad acct_expired=bad default=ignore] pam_systemd_home.so
-{% endif %}
--account sufficient pam_unix.so no_pass_expiry
--account required pam_permit.so
+-account required pam_unix.so no_pass_expiry
-
+account include system-auth
{% if HAVE_SELINUX %}
diff --git a/pld-sysv-network.patch b/pld-sysv-network.patch
index e2eb088..3e950e5 100644
--- a/pld-sysv-network.patch
+++ b/pld-sysv-network.patch
@@ -15,11 +15,11 @@ diff -dur -x '*.orig' systemd-218.orig/src/sysv-generator/sysv-generator.c syste
--- systemd-218.orig/src/sysv-generator/sysv-generator.c 2014-12-05 01:26:51.000000000 +0100
+++ systemd-218/src/sysv-generator/sysv-generator.c 2015-04-03 15:02:21.000000000 +0200
@@ -325,6 +325,15 @@
+
line++;
- t = strstrip(l);
+ // PLD specific ugly hack to detect SysV services requiring network
-+ if (startswith_no_case(t, ". /etc/sysconfig/network")) {
++ if (startswith_no_case(l, ". /etc/sysconfig/network")) {
+ r = strv_extend(&s->wants, "network.target");
+ if (r < 0)
+ log_error("[%s:%u] Failed to add dependency on network.target, ignoring: %s", s->path, line, strerror(-r));
@@ -27,6 +27,6 @@ diff -dur -x '*.orig' systemd-218.orig/src/sysv-generator/sysv-generator.c syste
+ if (r < 0)
+ log_error("[%s:%u] Failed to add dependency on network.target, ignoring: %s", s->path, line, strerror(-r));
+ }
- if (*t != '#') {
+ if (l[0] != '#') {
/* Try to figure out whether this init script supports
* the reload operation. This heuristic looks for
diff --git a/rpm-macros.patch b/rpm-macros.patch
index 43dd90d..44f8757 100644
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -53,11 +53,11 @@
+# %preun
+# %systemd_user_preun %{name}.service
- %_systemd_util_dir {{ROOTLIBEXECDIR}}
+ %_systemd_util_dir {{LIBEXECDIR}}
%_unitdir {{SYSTEM_DATA_UNIT_DIR}}
@@ -173,3 +221,34 @@
%{expand:%%{?__systemd_someargs_%#:%%__systemd_someargs_%# binfmt_apply}} \
- [ -x {{ROOTLIBEXECDIR}}/systemd-binfmt ] && {{ROOTLIBEXECDIR}}/systemd-binfmt %{?*} || : \
+ [ -x {{LIBEXECDIR}}/systemd-binfmt ] && {{LIBEXECDIR}}/systemd-binfmt %{?*} || : \
%{nil}
+
+# PLD macros
diff --git a/systemd-completion.patch b/systemd-completion.patch
deleted file mode 100644
index f49847f..0000000
--- a/systemd-completion.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urN systemd-241.orig/shell-completion/bash/meson.build systemd-241/shell-completion/bash/meson.build
---- systemd-241.orig/shell-completion/bash/meson.build 2019-02-14 11:11:58.000000000 +0100
-+++ systemd-241/shell-completion/bash/meson.build 2019-03-07 01:08:55.312337719 +0100
-@@ -30,7 +30,7 @@
- ['systemd-path', ''],
- ['systemd-run', ''],
- ['udevadm', ''],
-- ['bootctl', 'ENABLE_BOOTLOADER'],
-+ ['bootctl', ''],
- ['coredumpctl', 'ENABLE_COREDUMP'],
- ['homectl', 'ENABLE_HOMED'],
- ['hostnamectl', 'ENABLE_HOSTNAMED'],
-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
-@@ -25,7 +25,7 @@
- ['_sd_outputmodes', ''],
- ['_sd_unit_files', ''],
- ['_sd_machines', ''],
-- ['_bootctl', 'ENABLE_BOOTLOADER'],
-+ ['_bootctl', ''],
- ['_coredumpctl', 'ENABLE_COREDUMP'],
- ['_hostnamectl', 'ENABLE_HOSTNAMED'],
- ['_localectl', 'ENABLE_LOCALED'],
diff --git a/systemd-configfs.patch b/systemd-configfs.patch
index fb50264..34c3b6e 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://docs.kernel.org/filesystems/configfs.html
- Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
+ Documentation=https://systemd.io/API_FILE_SYSTEMS
DefaultDependencies=no
-ConditionPathExists=/sys/kernel/config
ConditionCapability=CAP_SYS_RAWIO
diff --git a/systemd-glibc.patch b/systemd-glibc.patch
deleted file mode 100644
index 1398e78..0000000
--- a/systemd-glibc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- systemd-stable-252.5/src/partition/growfs.c.orig 2023-01-26 09:12:21.000000000 +0100
-+++ systemd-stable-252.5/src/partition/growfs.c 2023-02-25 20:05:31.824939843 +0100
-@@ -13,6 +13,7 @@
- * See: https://github.com/systemd/systemd/issues/8507
- * [0] https://github.com/torvalds/linux/commit/a28135303a669917002f569aecebd5758263e4aa
- */
-+#define _LINUX_MOUNT_H
- #include <linux/btrfs.h>
-
- #include "sd-device.h"
diff --git a/systemd-x32.patch b/systemd-x32.patch
index 566f6c5..c64c057 100644
--- a/systemd-x32.patch
+++ b/systemd-x32.patch
@@ -2,7 +2,7 @@ diff -urN systemd-244.orig/src/test/test-seccomp.c systemd-244/src/test/test-sec
--- systemd-244.orig/src/test/test-seccomp.c 2019-11-29 17:32:36.000000000 +0100
+++ systemd-244/src/test/test-seccomp.c 2019-12-02 16:38:04.314771202 +0100
@@ -558,11 +558,11 @@
- uint32_t arch;
+ int r, shmid;
SECCOMP_FOREACH_LOCAL_ARCH(arch) {
- log_debug("arch %s: SCMP_SYS(mmap) = %d", seccomp_arch_to_string(arch), SCMP_SYS(mmap));
@@ -17,4 +17,4 @@ diff -urN systemd-244.orig/src/test/test-seccomp.c systemd-244/src/test/test-sec
+ log_debug("arch %s: SCMP_SYS(shmdt) = %lli", seccomp_arch_to_string(arch), (long long int) SCMP_SYS(shmdt));
}
- if (!is_seccomp_available()) {
+ CHECK_SECCOMP(/* skip_container= */ false);
diff --git a/target-pld.patch b/target-pld.patch
index 7ce2e0f..cb7de6d 100644
--- a/target-pld.patch
+++ b/target-pld.patch
@@ -6,19 +6,19 @@
int shorten_overlong(const char *s, char **ret);
+int read_etc_hostname_distro(const char *path, char **ret);
- int read_etc_hostname_stream(FILE *f, char **ret);
- int read_etc_hostname(const char *path, char **ret);
+ int read_etc_hostname_stream(FILE *f, bool substitute_wildcards, char **ret);
+ int read_etc_hostname(const char *path, bool substitute_wildcards, char **ret);
--- systemd-stable-248/src/shared/hostname-setup.c.orig 2021-03-30 22:59:02.000000000 +0200
+++ systemd-stable-248/src/shared/hostname-setup.c 2021-04-07 00:04:58.955649812 +0200
@@ -7,6 +7,7 @@
- #include <unistd.h>
+ #include "sd-daemon.h"
#include "alloc-util.h"
+#include "env-file.h"
+ #include "creds-util.h"
#include "fd-util.h"
#include "fileio.h"
- #include "fs-util.h"
@@ -130,13 +131,34 @@
}
}
@@ -39,7 +39,7 @@
+}
+
+
- int read_etc_hostname(const char *path, char **ret) {
+ int read_etc_hostname(const char *path, bool substitute_wildcards, char **ret) {
_cleanup_fclose_ FILE *f = NULL;
assert(ret);
@@ -47,7 +47,7 @@
- if (!path)
+ if (!path) {
+ int r;
- path = "/etc/hostname";
+ path = etc_hostname();
+ r = read_etc_hostname_distro(path, ret);
+ if (r == 0)
+ return r;
@@ -86,21 +86,21 @@
--- systemd-240/src/basic/time-util.c.orig 2019-01-13 09:27:36.718995151 +0100
+++ systemd-240/src/basic/time-util.c 2019-01-13 09:31:12.275659356 +0100
@@ -14,6 +14,7 @@
- #include <unistd.h>
#include "alloc-util.h"
+ #include "env-util.h"
+#include "env-file.h"
- #include "fd-util.h"
- #include "fileio.h"
- #include "fs-util.h"
+ #include "errno-util.h"
+ #include "extract-word.h"
+ #include "hexdecoct.h" /* IWYU pragma: keep */
@@ -1385,8 +1385,16 @@
- return r; /* returns EINVAL if not a symlink */
+ return r; /* Return EINVAL if not a symlink */
- e = PATH_STARTSWITH_SET(t, "/usr/share/zoneinfo/", "../usr/share/zoneinfo/");
+ const char *e = PATH_STARTSWITH_SET(t, "/usr/share/zoneinfo/", "../usr/share/zoneinfo/");
- if (!e)
- return -EINVAL;
+ if (!e) {
-+ r = parse_env_file(NULL, "/etc/sysconfig/timezone"
++ r = parse_env_file(NULL, "/etc/sysconfig/timezone",
+ "TIMEZONE", &e
+ );
+ if (r < 0) {
@@ -108,10 +108,10 @@
+ log_warning_errno(r, "Failed to read /etc/sysconfig/timezone: %m");
+ return -EINVAL;
+ }
-+ }
-
++ }
if (!timezone_is_valid(e, LOG_DEBUG))
return -EINVAL;
+
--- 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 @@
@@ -120,11 +120,11 @@
log_warning_errno(r, "Failed to read /etc/vconsole.conf, ignoring: %m");
- return r;
+
-+ int r1 = parse_env_file(NULL, "/etc/sysconfig/console"
-+ "CONSOLEFONT", &v.config[VC_FONT],
-+ "CONSOLEMAP", &v.config[VC_FONT_MAP],
-+ "CONSOLESCREENFONTMAP", &v.config[VC_FONT_UNIMAP],
-+ "KEYTABLE", &v.config[VC_KEYMAP]
++ int r1 = parse_env_file(NULL, "/etc/sysconfig/console",
++ "CONSOLEFONT", &v.font,
++ "CONSOLEMAP", &v.font_map,
++ "CONSOLESCREENFONTMAP", &v.font_unimap,
++ "KEYTABLE", &v.keymap
+ );
+ if (r1 < 0) {
+ if (r1 != -ENOENT)
diff --git a/udev-ploop-rules.patch b/udev-ploop-rules.patch
index c1b2ba4..7613604 100644
--- a/udev-ploop-rules.patch
+++ b/udev-ploop-rules.patch
@@ -3,7 +3,7 @@ diff -ru udev-182.orig/rules/60-persistent-storage.rules udev-182/rules/60-persi
+++ 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"
+ 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*|rbd*|zram*|ublkb*", GOTO="persistent_storage_end"
+KERNEL=="ploop*", GOTO="persistent_storage_end"
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/systemd.git/commitdiff/ebcc244aa99943ba1ffb47053a2bdf4173e98072
More information about the pld-cvs-commit
mailing list