diff --git a/backport-core-mount-fix-default-target-for-sysusr-usr-and-its.patch b/backport-core-mount-fix-default-target-for-sysusr-usr-and-its.patch new file mode 100644 index 0000000000000000000000000000000000000000..fbbc2a2f28ada22457d9c1bb34900685a88ce4d3 --- /dev/null +++ b/backport-core-mount-fix-default-target-for-sysusr-usr-and-its.patch @@ -0,0 +1,33 @@ +From dbfc096095cb741f5345be0dc6508628008c46d7 Mon Sep 17 00:00:00 2001 +From: Yu Watanabe +Date: Wed, 15 Feb 2023 14:23:34 +0900 +Subject: [PATCH] core/mount: fix default target for /sysusr/usr and its child + +Follow-up for 29a24ab28e9790680348b1ffab653a321fa49a67. + +Reference: https://github.com/systemd/systemd/pull/26418/commits/9df11e8ce5ba5f4e6bea9a50eccaf9ccc577d744 + +Signed-off-by: zhaoxiaohu +Signed-off-by: yuwang +--- + src/core/mount.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/core/mount.c b/src/core/mount.c +index 07ad4b2..fdd4e1e 100644 +--- a/src/core/mount.c ++++ b/src/core/mount.c +@@ -475,6 +475,10 @@ static int mount_add_default_ordering_dependencies( + after = NULL; + before = isempty(e) ? SPECIAL_INITRD_ROOT_FS_TARGET : SPECIAL_INITRD_FS_TARGET; + ++ } else if (in_initrd() && path_startswith(m->where, "/sysusr/usr")) { ++ after = NULL; ++ before = SPECIAL_INITRD_USR_FS_TARGET; ++ + } else if (mount_is_network(p)) { + after = SPECIAL_REMOTE_FS_PRE_TARGET; + before = SPECIAL_REMOTE_FS_TARGET; +-- +2.33.0 + diff --git a/systemd.spec b/systemd.spec index 149faeadeef010f58e68c960ddad8a606124dde8..9ebe0571b6f84c2881929cb5f1f17302a17e523a 100644 --- a/systemd.spec +++ b/systemd.spec @@ -21,7 +21,7 @@ Name: systemd Url: https://systemd.io/ Version: 249 -Release: 88 +Release: 89 License: MIT and LGPLv2+ and GPLv2+ Summary: System and Service Manager @@ -659,6 +659,7 @@ Patch6610: backport-sysusers-insist-that-root-group-is-0.patch Patch6611: backport-importd-Always-specify-file-unpacked-by-tar.patch Patch6612: backport-docs-remove-dev-tty-confusion.patch Patch6613: backport-wait-online-make-manager_link_is_online-return-0-whe.patch +Patch6614: backport-core-mount-fix-default-target-for-sysusr-usr-and-its.patch Patch9001: update-rtc-with-system-clock-when-shutdown.patch Patch9002: udev-add-actions-while-rename-netif-failed.patch @@ -2145,6 +2146,9 @@ grep -q -E '^KEYMAP="?fi-latin[19]"?' /etc/vconsole.conf 2>/dev/null && %{_libdir}/security/pam_systemd.so %changelog +* Tue Sep 3 2024 zhaoxiaohu - 249-89 +- add backport-core-mount-fix-default-target-for-sysusr-usr-and-its.patch + * Mon Sep 2 2024 zhaoxiaohu - 249-88 - wait-online: fix handling of unmanaged state - add backport-wait-online-make-manager_link_is_online-return-0-whe.patch