35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
|
From cad1e9c53d7ce0b8e461c094d6244a6409c80ab6 Mon Sep 17 00:00:00 2001
|
||
|
|
From: ml <6209465+ml-@users.noreply.github.com>
|
||
|
|
Date: Sun, 12 Feb 2023 00:22:52 +0100
|
||
|
|
Subject: [PATCH] nspawn: fix directory in logged error
|
||
|
|
|
||
|
|
(cherry picked from commit 7b03b44ed9f5f748670aa26193274dae94468149)
|
||
|
|
(cherry picked from commit cad1e9c53d7ce0b8e461c094d6244a6409c80ab6)
|
||
|
|
(cherry picked from commit 3a44be9ad0d9e718c2a79d42d43f2f453b3e6e58)
|
||
|
|
(cherry picked from commit b98d71f53cdc0fa72c7ec98b6dde386001e73a08)
|
||
|
|
|
||
|
|
Reference: https://github.com/systemd/systemd-stable/pull/259/commits/d308228093d07d6a0c9376dff7ea916d8a48de37
|
||
|
|
|
||
|
|
Signed-off-by: zhaoxiaohu <zhaoxiaohu@kuaishou.com>
|
||
|
|
Signed-off-by: yuwang <yuwang@kuaishou.com>
|
||
|
|
---
|
||
|
|
src/nspawn/nspawn-bind-user.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/nspawn/nspawn-bind-user.c b/src/nspawn/nspawn-bind-user.c
|
||
|
|
index 6852125..6c2da8a 100644
|
||
|
|
--- a/src/nspawn/nspawn-bind-user.c
|
||
|
|
+++ b/src/nspawn/nspawn-bind-user.c
|
||
|
|
@@ -400,7 +400,7 @@ int bind_user_setup(
|
||
|
|
|
||
|
|
r = userns_mkdir(root, "/run/host/home", 0755, 0, 0);
|
||
|
|
if (r < 0)
|
||
|
|
- return log_error_errno(r, "Failed to create /run/host/userdb: %m");
|
||
|
|
+ return log_error_errno(r, "Failed to create /run/host/home: %m");
|
||
|
|
|
||
|
|
r = userns_mkdir(root, "/run/host/userdb", 0755, 0, 0);
|
||
|
|
if (r < 0)
|
||
|
|
--
|
||
|
|
2.33.0
|
||
|
|
|