automatic import of systemdopeneuler24.03_LTS

1 files changed, 32 insertions, 0 deletions

diff --git a/backport-login-user-runtime-dir-properly-check-for-mount-poin.patch b/backport-login-user-runtime-dir-properly-check-for-mount-poin.patch
new file mode 100644
index 0000000..474737a
--- /dev/null
+++ b/backport-login-user-runtime-dir-properly-check-for-mount-poin.patch
@@ -0,0 +1,32 @@
+From 4c3e455c093c274e3ccbc4662e47a72c3f43a34d Mon Sep 17 00:00:00 2001
+From: Mike Yuan <me@yhndnzj.com>
+Date: Mon, 5 Feb 2024 04:53:14 +0800
+Subject: [PATCH] login/user-runtime-dir: properly check for mount point
+
+(cherry picked from commit 561d8793058bba886d71f96fa157ca77cd6b5c23)
+(cherry picked from commit 0ec2d29241b9d5d77630ba5ad7fa1cf4f632e1f6)
+(cherry picked from commit ad9eafcc8264976b762efe4d0ce70f924d2be0bc)
+
+Conflict:NA
+Reference:https://github.com/systemd/systemd-stable/commit/4c3e455c093c274e3ccbc4662e47a72c3f43a34d
+
+---
+ src/login/user-runtime-dir.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/login/user-runtime-dir.c b/src/login/user-runtime-dir.c
+index f96a2d8662..c74d8b8d0e 100644
+--- a/src/login/user-runtime-dir.c
++++ b/src/login/user-runtime-dir.c
+@@ -66,7 +66,7 @@ static int user_mkdir_runtime_path(
+         if (r < 0)
+                 return log_error_errno(r, "Failed to create /run/user: %m");
+ 
+-        if (path_is_mount_point(runtime_path, NULL, 0) >= 0)
++        if (path_is_mount_point(runtime_path, NULL, 0) > 0)
+                 log_debug("%s is already a mount point", runtime_path);
+         else {
+                 char options[sizeof("mode=0700,uid=,gid=,size=,nr_inodes=,smackfsroot=*")
+-- 
+2.33.0
+