diff --git a/packages/systemd/9001-use-absolute-path-for-var-run-symlink.patch b/packages/systemd/9001-use-absolute-path-for-var-run-symlink.patch index cfff79430c3..8a72deed1ff 100644 --- a/packages/systemd/9001-use-absolute-path-for-var-run-symlink.patch +++ b/packages/systemd/9001-use-absolute-path-for-var-run-symlink.patch @@ -1,7 +1,7 @@ -From 4582d854afd5b42fdc952fafd89d762dcb279da9 Mon Sep 17 00:00:00 2001 +From 2e4d5ecb4c47a9d2d20cb4de42484eda032a5262 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Mon, 3 Jan 2022 20:22:17 +0000 -Subject: [PATCH 9001/9011] use absolute path for /var/run symlink +Subject: [PATCH] use absolute path for /var/run symlink Otherwise the symlink may be broken if /var is a bind mount from somewhere else. @@ -25,5 +25,5 @@ index 557dd20..bf84f5a 100644 d /var/log 0755 - - - {% if ENABLE_UTMP %} -- -2.36.1 +2.40.1 diff --git a/packages/systemd/9002-core-add-separate-timeout-for-system-shutdown.patch b/packages/systemd/9002-core-add-separate-timeout-for-system-shutdown.patch index 404118d30de..68c6726e65c 100644 --- a/packages/systemd/9002-core-add-separate-timeout-for-system-shutdown.patch +++ b/packages/systemd/9002-core-add-separate-timeout-for-system-shutdown.patch @@ -1,7 +1,7 @@ -From 71a774ad3c3dfd5f9ddb96f7b08a957144e93323 Mon Sep 17 00:00:00 2001 +From e66920d0a95a3e53b24a2f270420a85d0f2395ea Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Tue, 10 Mar 2020 20:30:10 +0000 -Subject: [PATCH 9002/9011] core: add separate timeout for system shutdown +Subject: [PATCH] core: add separate timeout for system shutdown There is an existing setting for this (DefaultTimeoutStopUSec), but changing it has no effect because `reset_arguments()` is called just @@ -13,16 +13,17 @@ services, and for cleaning up stray processes after most of userspace has gone away. Signed-off-by: Ben Cressey +Signed-off-by: Arnaldo Garcia Rincon --- src/basic/def.h | 3 +++ src/core/main.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/basic/def.h b/src/basic/def.h -index eccee3d..3f5bef5 100644 +index 2b4de29..22034c7 100644 --- a/src/basic/def.h +++ b/src/basic/def.h -@@ -13,6 +13,9 @@ +@@ -18,6 +18,9 @@ * the watchdog pings will keep the loop busy. */ #define DEFAULT_EXIT_USEC (30*USEC_PER_SEC) @@ -33,34 +34,34 @@ index eccee3d..3f5bef5 100644 #define DEFAULT_UNIX_MAX_DGRAM_QLEN 512UL diff --git a/src/core/main.c b/src/core/main.c -index 57aedb9..45fc78c 100644 +index a84fafa..0981742 100644 --- a/src/core/main.c +++ b/src/core/main.c -@@ -131,6 +131,7 @@ static ExecOutput arg_default_std_error; +@@ -133,6 +133,7 @@ static ExecOutput arg_default_std_error; static usec_t arg_default_restart_usec; static usec_t arg_default_timeout_start_usec; static usec_t arg_default_timeout_stop_usec; +static usec_t arg_default_timeout_shutdown_usec; static usec_t arg_default_timeout_abort_usec; + static usec_t arg_default_device_timeout_usec; static bool arg_default_timeout_abort_set; - static usec_t arg_default_start_limit_interval; -@@ -1552,7 +1553,7 @@ static int become_shutdown( +@@ -1492,7 +1493,7 @@ static int become_shutdown( env_block = strv_copy(environ); - xsprintf(log_level, "%d", log_get_max_level()); -- xsprintf(timeout, "%" PRI_USEC "us", arg_default_timeout_stop_usec); -+ xsprintf(timeout, "%" PRI_USEC "us", arg_default_timeout_shutdown_usec); + xsprintf(log_level, "--log-level=%d", log_get_max_level()); +- xsprintf(timeout, "--timeout=%" PRI_USEC "us", arg_default_timeout_stop_usec); ++ xsprintf(timeout, "--timeout=%" PRI_USEC "us", arg_default_timeout_shutdown_usec); switch (log_get_target()) { -@@ -2443,6 +2444,7 @@ static void reset_arguments(void) { +@@ -2410,6 +2411,7 @@ static void reset_arguments(void) { arg_default_restart_usec = DEFAULT_RESTART_USEC; arg_default_timeout_start_usec = DEFAULT_TIMEOUT_USEC; arg_default_timeout_stop_usec = DEFAULT_TIMEOUT_USEC; + arg_default_timeout_shutdown_usec = DEFAULT_TIMEOUT_SHUTDOWN_USEC; arg_default_timeout_abort_usec = DEFAULT_TIMEOUT_USEC; arg_default_timeout_abort_set = false; - arg_default_start_limit_interval = DEFAULT_START_LIMIT_INTERVAL; + arg_default_device_timeout_usec = DEFAULT_TIMEOUT_USEC; -- -2.36.1 +2.40.1 diff --git a/packages/systemd/9003-machine-id-setup-generate-stable-ID-under-Xen-and-VM.patch b/packages/systemd/9003-machine-id-setup-generate-stable-ID-under-Xen-and-VM.patch index df05505e250..8400c8ebae1 100644 --- a/packages/systemd/9003-machine-id-setup-generate-stable-ID-under-Xen-and-VM.patch +++ b/packages/systemd/9003-machine-id-setup-generate-stable-ID-under-Xen-and-VM.patch @@ -1,30 +1,30 @@ -From 95824ee80743b604e4b1757818f1ea7bf2971462 Mon Sep 17 00:00:00 2001 +From dd1d0221bb0ff143277faa4a7341e290a3941587 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Mon, 3 Jan 2022 21:57:11 +0000 -Subject: [PATCH 9003/9011] machine-id-setup: generate stable ID under Xen and - VMware +Subject: [PATCH] machine-id-setup: generate stable ID under Xen and VMware Signed-off-by: Ben Cressey +Signed-off-by: Arnaldo Garcia Rincon --- src/libsystemd/sd-id128/id128-util.c | 2 ++ src/shared/machine-id-setup.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libsystemd/sd-id128/id128-util.c b/src/libsystemd/sd-id128/id128-util.c -index 7c66d1c..edfebcb 100644 +index 2cf8848..fd011a1 100644 --- a/src/libsystemd/sd-id128/id128-util.c +++ b/src/libsystemd/sd-id128/id128-util.c -@@ -220,6 +220,8 @@ int id128_get_product(sd_id128_t *ret) { - r = id128_read("/sys/class/dmi/id/product_uuid", ID128_UUID, &uuid); +@@ -184,6 +184,8 @@ int id128_get_product(sd_id128_t *ret) { + r = id128_read("/sys/class/dmi/id/product_uuid", ID128_FORMAT_UUID, &uuid); if (r == -ENOENT) - r = id128_read("/proc/device-tree/vm,uuid", ID128_UUID, &uuid); + r = id128_read("/proc/device-tree/vm,uuid", ID128_FORMAT_UUID, &uuid); + if (r == -ENOENT) -+ r = id128_read("/sys/hypervisor/uuid", ID128_UUID, &uuid); ++ r = id128_read("/sys/hypervisor/uuid", ID128_FORMAT_UUID, &uuid); if (r < 0) return r; diff --git a/src/shared/machine-id-setup.c b/src/shared/machine-id-setup.c -index e483675..809f1bc 100644 +index 787c076..eccb332 100644 --- a/src/shared/machine-id-setup.c +++ b/src/shared/machine-id-setup.c @@ -60,7 +60,8 @@ static int generate_machine_id(const char *root, sd_id128_t *ret) { @@ -38,5 +38,5 @@ index e483675..809f1bc 100644 /* If we are not running in a container, see if we are running in a VM that provides * a system UUID via the SMBIOS/DMI interfaces. Such environments include QEMU/KVM -- -2.36.1 +2.40.1 diff --git a/packages/systemd/9004-units-mount-tmp-with-noexec.patch b/packages/systemd/9004-units-mount-tmp-with-noexec.patch index f0d41d809fc..ff3e3597f88 100644 --- a/packages/systemd/9004-units-mount-tmp-with-noexec.patch +++ b/packages/systemd/9004-units-mount-tmp-with-noexec.patch @@ -1,7 +1,7 @@ -From e02f2a077e97a4f73697ef9a6769e41401b1ca97 Mon Sep 17 00:00:00 2001 +From d9eb89767267d43f13c30ce74f6e9c34c4000274 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Sat, 28 May 2022 03:52:28 +0000 -Subject: [PATCH 9004/9011] units: mount /tmp with noexec +Subject: [PATCH] units: mount /tmp with noexec Signed-off-by: Ben Cressey --- @@ -19,5 +19,5 @@ index 734acea..e4990b7 100644 -Options=mode=1777,strictatime,nosuid,nodev,size=50%%,nr_inodes=1m +Options=mode=1777,strictatime,nosuid,nodev,noexec,size=50%%,nr_inodes=1m -- -2.36.1 +2.40.1 diff --git a/packages/systemd/9005-mount-setup-apply-noexec-to-more-mounts.patch b/packages/systemd/9005-mount-setup-apply-noexec-to-more-mounts.patch index 00ef435d21d..904aa07a743 100644 --- a/packages/systemd/9005-mount-setup-apply-noexec-to-more-mounts.patch +++ b/packages/systemd/9005-mount-setup-apply-noexec-to-more-mounts.patch @@ -1,7 +1,7 @@ -From 5a822486905915396d27da85b336f0877e612532 Mon Sep 17 00:00:00 2001 +From e6565e7f288f84b9e5f723c55ca9e5619b0db846 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Sat, 28 May 2022 03:49:46 +0000 -Subject: [PATCH 9005/9011] mount-setup: apply noexec to more mounts +Subject: [PATCH] mount-setup: apply noexec to more mounts Signed-off-by: Ben Cressey --- @@ -9,7 +9,7 @@ Signed-off-by: Ben Cressey 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c -index 7917968..debc043 100644 +index 7ba579e..03fc774 100644 --- a/src/shared/mount-setup.c +++ b/src/shared/mount-setup.c @@ -73,18 +73,18 @@ static const MountPoint mount_table[] = { @@ -36,5 +36,5 @@ index 7917968..debc043 100644 { "cgroup2", "/sys/fs/cgroup", "cgroup2", "nsdelegate,memory_recursiveprot", MS_NOSUID|MS_NOEXEC|MS_NODEV, cg_is_unified_wanted, MNT_IN_CONTAINER|MNT_CHECK_WRITABLE }, -- -2.36.1 +2.40.1 diff --git a/packages/systemd/9006-mount-setup-mount-etc-with-specific-label.patch b/packages/systemd/9006-mount-setup-mount-etc-with-specific-label.patch index 27e3ef2533d..664301813d9 100644 --- a/packages/systemd/9006-mount-setup-mount-etc-with-specific-label.patch +++ b/packages/systemd/9006-mount-setup-mount-etc-with-specific-label.patch @@ -1,7 +1,7 @@ -From 2e871585a26b1f107db88a0ec0d9951735a6ec49 Mon Sep 17 00:00:00 2001 +From d45be2a1f7a2d58efff7921c350fffe8f26901a4 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Thu, 9 Jul 2020 20:00:36 +0000 -Subject: [PATCH 9006/9011] mount-setup: mount /etc with specific label +Subject: [PATCH] mount-setup: mount /etc with specific label The filesystem is mounted after we load the SELinux policy, so we can apply the label we need to restrict access. @@ -12,7 +12,7 @@ Signed-off-by: Ben Cressey 1 file changed, 4 insertions(+) diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c -index debc043..a9c00b3 100644 +index 03fc774..8a25823 100644 --- a/src/shared/mount-setup.c +++ b/src/shared/mount-setup.c @@ -61,6 +61,8 @@ typedef struct MountPoint { @@ -24,7 +24,7 @@ index debc043..a9c00b3 100644 static const MountPoint mount_table[] = { { "proc", "/proc", "proc", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV, NULL, MNT_FATAL|MNT_IN_CONTAINER|MNT_FOLLOW_SYMLINK }, -@@ -110,6 +112,8 @@ static const MountPoint mount_table[] = { +@@ -112,6 +114,8 @@ static const MountPoint mount_table[] = { #endif { "bpf", "/sys/fs/bpf", "bpf", "mode=700", MS_NOSUID|MS_NOEXEC|MS_NODEV, NULL, MNT_NONE, }, @@ -34,5 +34,5 @@ index debc043..a9c00b3 100644 bool mount_point_is_api(const char *path) { -- -2.36.1 +2.40.1 diff --git a/packages/systemd/9007-journal-disable-keyed-hashes-for-compatibility.patch b/packages/systemd/9007-journal-disable-keyed-hashes-for-compatibility.patch deleted file mode 100644 index 6e829d23e7e..00000000000 --- a/packages/systemd/9007-journal-disable-keyed-hashes-for-compatibility.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 81808b8ed1259d4d05052b6825d9b560f93098e5 Mon Sep 17 00:00:00 2001 -From: Ben Cressey -Date: Thu, 12 Nov 2020 16:18:15 +0000 -Subject: [PATCH 9007/9011] journal: disable keyed hashes for compatibility - -Otherwise the journal is not readable by older versions of systemd. - -This is applied as a patch so it will fail to apply when upstream -removes the environment variable override. - -Signed-off-by: Ben Cressey ---- - src/libsystemd/sd-journal/journal-file.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/src/libsystemd/sd-journal/journal-file.c b/src/libsystemd/sd-journal/journal-file.c -index 369b328..0d0a005 100644 ---- a/src/libsystemd/sd-journal/journal-file.c -+++ b/src/libsystemd/sd-journal/journal-file.c -@@ -3325,13 +3325,12 @@ int journal_file_open( - #endif - }; - -- /* We turn on keyed hashes by default, but provide an environment variable to turn them off, if -- * people really want that */ -+ /* Turn off keyed hashes by default. */ - r = getenv_bool("SYSTEMD_JOURNAL_KEYED_HASH"); - if (r < 0) { - if (r != -ENXIO) - log_debug_errno(r, "Failed to parse $SYSTEMD_JOURNAL_KEYED_HASH environment variable, ignoring."); -- f->keyed_hash = true; -+ f->keyed_hash = false; - } else - f->keyed_hash = r; - --- -2.36.1 - diff --git a/packages/systemd/9008-pkg-config-stop-hardcoding-prefix-to-usr.patch b/packages/systemd/9007-pkg-config-stop-hardcoding-prefix-to-usr.patch similarity index 80% rename from packages/systemd/9008-pkg-config-stop-hardcoding-prefix-to-usr.patch rename to packages/systemd/9007-pkg-config-stop-hardcoding-prefix-to-usr.patch index b85c443257d..d27612f7323 100644 --- a/packages/systemd/9008-pkg-config-stop-hardcoding-prefix-to-usr.patch +++ b/packages/systemd/9007-pkg-config-stop-hardcoding-prefix-to-usr.patch @@ -1,7 +1,7 @@ -From dc6abce8797a6a2e63c4ae58218588327e73d4cb Mon Sep 17 00:00:00 2001 +From 692205df10b9a803d5324c5284605481722b27a1 Mon Sep 17 00:00:00 2001 From: Erikson Tung Date: Mon, 3 Jan 2022 22:07:25 +0000 -Subject: [PATCH 9008/9011] pkg-config: stop hardcoding prefix to /usr +Subject: [PATCH] pkg-config: stop hardcoding prefix to /usr While we ensure /usr points to the sys-root at runtime, for Bottlerocket's packaging we need to be careful to avoid dependencies on the host OS so @@ -11,7 +11,7 @@ the prefix needs to be configurable. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in -index fc0f8c3..afe7b02 100644 +index 693433b..c5ba688 100644 --- a/src/core/systemd.pc.in +++ b/src/core/systemd.pc.in @@ -11,7 +11,7 @@ @@ -24,5 +24,5 @@ index fc0f8c3..afe7b02 100644 rootprefix=${root_prefix} sysconf_dir={{SYSCONF_DIR}} -- -2.36.1 +2.40.1 diff --git a/packages/systemd/9009-sysctl-do-not-set-rp_filter-via-wildcard.patch b/packages/systemd/9008-sysctl-do-not-set-rp_filter-via-wildcard.patch similarity index 87% rename from packages/systemd/9009-sysctl-do-not-set-rp_filter-via-wildcard.patch rename to packages/systemd/9008-sysctl-do-not-set-rp_filter-via-wildcard.patch index edd5e784d9c..3c836678f54 100644 --- a/packages/systemd/9009-sysctl-do-not-set-rp_filter-via-wildcard.patch +++ b/packages/systemd/9008-sysctl-do-not-set-rp_filter-via-wildcard.patch @@ -1,7 +1,7 @@ -From 0aee69ee8b337ff50d4f7723e3c93f222bf239b1 Mon Sep 17 00:00:00 2001 +From e100d5345ad9104697ece66a4d638807df74e6b8 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Mon, 21 Jun 2021 20:53:47 +0000 -Subject: [PATCH 9009/9011] sysctl: do not set rp_filter via wildcard +Subject: [PATCH] sysctl: do not set rp_filter via wildcard The wildcard matches existing interfaces when `systemd-sysctl` runs at startup, but also applies to new interfaces when it is invoked by @@ -32,5 +32,5 @@ index f41e24b..9a6ae96 100644 # Do not accept source routing -- -2.36.1 +2.40.1 diff --git a/packages/systemd/9010-sysusers-set-root-shell-to-sbin-nologin.patch b/packages/systemd/9009-sysusers-set-root-shell-to-sbin-nologin.patch similarity index 77% rename from packages/systemd/9010-sysusers-set-root-shell-to-sbin-nologin.patch rename to packages/systemd/9009-sysusers-set-root-shell-to-sbin-nologin.patch index 6a21f274582..7a96aeeafd5 100644 --- a/packages/systemd/9010-sysusers-set-root-shell-to-sbin-nologin.patch +++ b/packages/systemd/9009-sysusers-set-root-shell-to-sbin-nologin.patch @@ -1,7 +1,7 @@ -From 569fd4752f891f07643658b5d3478200346a12cb Mon Sep 17 00:00:00 2001 +From 4280d48485805d16481f63834c355e2e0c42c761 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Sat, 28 May 2022 04:12:07 +0000 -Subject: [PATCH 9010/9011] sysusers: set root shell to /sbin/nologin +Subject: [PATCH] sysusers: set root shell to /sbin/nologin Signed-off-by: Ben Cressey --- @@ -9,7 +9,7 @@ Signed-off-by: Ben Cressey 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysusers.d/basic.conf.in b/sysusers.d/basic.conf.in -index a1af8be098..b9955c55c6 100644 +index a1af8be..b9955c5 100644 --- a/sysusers.d/basic.conf.in +++ b/sysusers.d/basic.conf.in @@ -7,7 +7,7 @@ @@ -22,5 +22,5 @@ index a1af8be098..b9955c55c6 100644 # The nobody user/group for NFS file systems g {{NOBODY_GROUP_NAME}} 65534 - - -- -2.25.1 +2.40.1 diff --git a/packages/systemd/9011-units-keep-modprobe-service-units-running.patch b/packages/systemd/9010-units-keep-modprobe-service-units-running.patch similarity index 68% rename from packages/systemd/9011-units-keep-modprobe-service-units-running.patch rename to packages/systemd/9010-units-keep-modprobe-service-units-running.patch index 616088906cc..b9dee2da8a7 100644 --- a/packages/systemd/9011-units-keep-modprobe-service-units-running.patch +++ b/packages/systemd/9010-units-keep-modprobe-service-units-running.patch @@ -1,7 +1,7 @@ -From 13bf60bf11edf407246176262865c8e93f66c1e8 Mon Sep 17 00:00:00 2001 +From 4444604feb71d9b31896fbf0a5bf02e8270a3411 Mon Sep 17 00:00:00 2001 From: Ben Cressey Date: Sun, 17 Jul 2022 16:21:16 +0000 -Subject: [PATCH 9011/9011] units: keep modprobe service units running +Subject: [PATCH] units: keep modprobe service units running Otherwise, the units are restarted when the default target changes. @@ -11,14 +11,14 @@ Signed-off-by: Ben Cressey 1 file changed, 1 insertion(+) diff --git a/units/modprobe@.service b/units/modprobe@.service -index cf8baf6..a029ab0 100644 +index 85a2c08..2994082 100644 --- a/units/modprobe@.service +++ b/units/modprobe@.service -@@ -17,3 +17,4 @@ ConditionCapability=CAP_SYS_MODULE +@@ -18,3 +18,4 @@ StartLimitIntervalSec=0 [Service] Type=oneshot ExecStart=-/sbin/modprobe -abq %I +RemainAfterExit=true -- -2.36.1 +2.40.1 diff --git a/packages/systemd/9012-tmpfiles-Split-networkd-entries-into-a-separate-file.patch b/packages/systemd/9011-tmpfiles-Split-networkd-entries-into-a-separate-file.patch similarity index 93% rename from packages/systemd/9012-tmpfiles-Split-networkd-entries-into-a-separate-file.patch rename to packages/systemd/9011-tmpfiles-Split-networkd-entries-into-a-separate-file.patch index 091d3ea47ce..a447b6d4f77 100644 --- a/packages/systemd/9012-tmpfiles-Split-networkd-entries-into-a-separate-file.patch +++ b/packages/systemd/9011-tmpfiles-Split-networkd-entries-into-a-separate-file.patch @@ -1,4 +1,4 @@ -From abdd268ab3c16c606a1578e5d40d5847a1d99523 Mon Sep 17 00:00:00 2001 +From 036e90b85cc26200b1887ca764f703f2a9f4fb74 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Wed, 27 Apr 2022 10:25:22 +0100 Subject: [PATCH] tmpfiles: Split networkd entries into a separate file @@ -15,7 +15,7 @@ into a separate file to make that possible. create mode 100644 tmpfiles.d/systemd-network.conf diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build -index b8d3919025..7c2604cfe1 100644 +index b8d3919..7c2604c 100644 --- a/tmpfiles.d/meson.build +++ b/tmpfiles.d/meson.build @@ -13,6 +13,7 @@ files = [['README', ''], @@ -28,7 +28,7 @@ index b8d3919025..7c2604cfe1 100644 foreach pair : files diff --git a/tmpfiles.d/systemd-network.conf b/tmpfiles.d/systemd-network.conf new file mode 100644 -index 0000000000..b30bc914a5 +index 0000000..b30bc91 --- /dev/null +++ b/tmpfiles.d/systemd-network.conf @@ -0,0 +1,13 @@ @@ -46,7 +46,7 @@ index 0000000000..b30bc914a5 +d /run/systemd/netif/leases 0755 systemd-network systemd-network - +d /run/systemd/netif/lldp 0755 systemd-network systemd-network - diff --git a/tmpfiles.d/systemd.conf.in b/tmpfiles.d/systemd.conf.in -index 9b2357cd31..e23e102782 100644 +index 9b2357c..e23e102 100644 --- a/tmpfiles.d/systemd.conf.in +++ b/tmpfiles.d/systemd.conf.in @@ -18,12 +18,6 @@ d /run/systemd/sessions 0755 root root - @@ -63,5 +63,5 @@ index 9b2357cd31..e23e102782 100644 d /run/log 0755 root root - -- -2.38.1 +2.40.1 diff --git a/packages/systemd/9013-systemd-networkd-Conditionalize-hostnamed-timezoned-DBUS.patch b/packages/systemd/9012-systemd-networkd-Conditionalize-hostnamed-timezoned-.patch similarity index 96% rename from packages/systemd/9013-systemd-networkd-Conditionalize-hostnamed-timezoned-DBUS.patch rename to packages/systemd/9012-systemd-networkd-Conditionalize-hostnamed-timezoned-.patch index 22df4230e7a..6798700b4db 100644 --- a/packages/systemd/9013-systemd-networkd-Conditionalize-hostnamed-timezoned-DBUS.patch +++ b/packages/systemd/9012-systemd-networkd-Conditionalize-hostnamed-timezoned-.patch @@ -1,4 +1,4 @@ -From a30b5e19083d88a9e26027488e42cc3105ad4689 Mon Sep 17 00:00:00 2001 +From 3ba1f48b28c5d510222066e5a9b211828ac8f426 Mon Sep 17 00:00:00 2001 From: Zac Mrowicki Date: Thu, 6 Jul 2023 17:50:28 +0000 Subject: [PATCH] systemd-networkd: Conditionalize hostnamed/timezoned DBUS @@ -59,7 +59,7 @@ index c19bc10..9d13cde 100644 bool address_is_filtered(int family, const union in_addr_union *address, uint8_t prefixlen, Set *allow_list, Set *deny_list); static inline bool in4_address_is_filtered(const struct in_addr *address, Set *allow_list, Set *deny_list) { diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c -index ff2770f..a225526 100644 +index ff2770f..5aede2d 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -845,6 +845,7 @@ static int set_hostname_handler(sd_bus_message *m, void *userdata, sd_bus_error @@ -92,7 +92,7 @@ index ff2770f..a225526 100644 } +#endif diff --git a/src/network/networkd-manager.h b/src/network/networkd-manager.h -index 86de529..b80c6c5 100644 +index 86de529..0fef259 100644 --- a/src/network/networkd-manager.h +++ b/src/network/networkd-manager.h @@ -110,7 +110,20 @@ bool manager_should_reload(Manager *m); @@ -117,5 +117,5 @@ index 86de529..b80c6c5 100644 DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free); -- -2.38.1 +2.40.1 diff --git a/packages/systemd/systemd.spec b/packages/systemd/systemd.spec index 31c0f232fc3..405b80802ec 100644 --- a/packages/systemd/systemd.spec +++ b/packages/systemd/systemd.spec @@ -56,31 +56,26 @@ Patch9005: 9005-mount-setup-apply-noexec-to-more-mounts.patch # Local patch to handle mounting /etc with our SELinux label. Patch9006: 9006-mount-setup-mount-etc-with-specific-label.patch -# Local patch to disable the keyed hashes feature in the journal, which -# makes it unreadable by older versions of systemd. Can be dropped once -# there's sufficiently broad adoption of systemd >= 246. -Patch9007: 9007-journal-disable-keyed-hashes-for-compatibility.patch - # We need `prefix` to be configurable for our own packaging so we can avoid # dependencies on the host OS. -Patch9008: 9008-pkg-config-stop-hardcoding-prefix-to-usr.patch +Patch9007: 9007-pkg-config-stop-hardcoding-prefix-to-usr.patch # Local patch to stop overriding rp_filter defaults with wildcard values. -Patch9009: 9009-sysctl-do-not-set-rp_filter-via-wildcard.patch +Patch9008: 9008-sysctl-do-not-set-rp_filter-via-wildcard.patch # Local patch to set root's shell to /sbin/nologin rather than /bin/sh. -Patch9010: 9010-sysusers-set-root-shell-to-sbin-nologin.patch +Patch9009: 9009-sysusers-set-root-shell-to-sbin-nologin.patch # Local patch to keep modprobe units running to avoid repeated log entries. -Patch9011: 9011-units-keep-modprobe-service-units-running.patch +Patch9010: 9010-units-keep-modprobe-service-units-running.patch # Local patch to split the systemd-networkd tmpfiles into a separate file which # allows us to exclude them when not using networkd. -Patch9012: 9012-tmpfiles-Split-networkd-entries-into-a-separate-file.patch +Patch9011: 9011-tmpfiles-Split-networkd-entries-into-a-separate-file.patch # Local patch to conditionalize systemd-networkd calls to hostname and timezone # DBUS services not used in Bottlerocket -Patch9013: 9013-systemd-networkd-Conditionalize-hostnamed-timezoned-DBUS.patch +Patch9012: 9012-systemd-networkd-Conditionalize-hostnamed-timezoned-.patch BuildRequires: gperf BuildRequires: intltool