From 3c979451b5f84a005fcaa7f68506273b99b2858a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BF=A0=E5=87=8C?= Date: Tue, 12 Dec 2023 17:04:38 +0800 Subject: [PATCH 1/2] standarize patch number of cherry-picked patch 0914->10026 --- ...-umount-check-LO_FLAGS_AUTOCLEAR-after-LOOP_CLR_FD-cl.patch | 3 +++ systemd.spec | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) rename 0914-umount-check-LO_FLAGS_AUTOCLEAR-after-LOOP_CLR_FD-cl.patch => 10026-umount-check-LO_FLAGS_AUTOCLEAR-after-LOOP_CLR_FD-cl.patch (95%) diff --git a/0914-umount-check-LO_FLAGS_AUTOCLEAR-after-LOOP_CLR_FD-cl.patch b/10026-umount-check-LO_FLAGS_AUTOCLEAR-after-LOOP_CLR_FD-cl.patch similarity index 95% rename from 0914-umount-check-LO_FLAGS_AUTOCLEAR-after-LOOP_CLR_FD-cl.patch rename to 10026-umount-check-LO_FLAGS_AUTOCLEAR-after-LOOP_CLR_FD-cl.patch index c24ff51..fbc76ac 100644 --- a/0914-umount-check-LO_FLAGS_AUTOCLEAR-after-LOOP_CLR_FD-cl.patch +++ b/10026-umount-check-LO_FLAGS_AUTOCLEAR-after-LOOP_CLR_FD-cl.patch @@ -7,6 +7,9 @@ Subject: [PATCH] umount: check LO_FLAGS_AUTOCLEAR after LOOP_CLR_FD claimed Fixes: #14410 Replaces: #14386 +For Lifsea-ng, this patch fixes the problem that the system occasionally +fail to shutdown caused by /sysroot unable to umount. + --- systemd-239/src/core/umount.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/systemd.spec b/systemd.spec index 64383fe..7bbb232 100644 --- a/systemd.spec +++ b/systemd.spec @@ -964,7 +964,6 @@ Patch0910: 0910-ci-workflow-for-gathering-metadata-for-source-git-au.patch Patch0911: 0911-ci-first-part-of-the-source-git-automation-commit-li.patch Patch0912: 0912-login-add-a-missing-error-check-for-session_set_lead.patch Patch0913: 0913-logind-reset-session-leader-if-we-know-for-a-fact-th.patch -Patch0914: 0914-umount-check-LO_FLAGS_AUTOCLEAR-after-LOOP_CLR_FD-cl.patch Patch10000: 10000-core-fix-a-null-reference-case-in-load_from_path.patch Patch10001: 10001-sysctl-Don-t-pass-null-directive-argument-to-s.patch @@ -992,6 +991,7 @@ Patch10022: 10022-fileio-add-support-for-read_full_file-on-AF_UNIX-st.patch Patch10023: 10023-fileio-beef-up-READ_FULL_FILE_CONNECT_SOCKET-to-all.patch Patch10024: 10024-fileio-teach-read_full_file_full-to-read-from-offse.patch Patch10025: 10025-cryptsetup-port-cryptsetup-s-main-key-file-logic-ov.patch +Patch10026: 10026-umount-check-LO_FLAGS_AUTOCLEAR-after-LOOP_CLR_FD-cl.patch Patch20001: 20001-hwdb-parse_hwdb_dot_py.patch Patch20002: 20002-cgroup-do-not-refresh-cgroup-devices-config-when-dae.patch -- Gitee From 46cd1a6734baaff694213c1c1d1752ebf0192708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BF=A0=E5=87=8C?= Date: Tue, 12 Dec 2023 17:15:44 +0800 Subject: [PATCH 2/2] add README.md to especially address patch indexing convention --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..7d30ca3 --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ +# systemd-239 + +This is the repository of systemd-239 for Anolis OS 8. + +## Patch index convention + +Below is the patch index convention of this repository: + +- 0001 ... 0xxx : patches from upstream srpm +- 10001 ... 10xxx : patches cherry-picked from systemd github upstream +- 20001 ... 20xxx : original patch by OpenAnolis community \ No newline at end of file -- Gitee