From 12cc96016374b5eca072d9f94542c3145def313f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 19 Jun 2023 13:35:00 +0200 Subject: [PATCH] shared: improve messages about switch root operations "change" is not clear without context. --- src/shared/mount-util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/shared/mount-util.c b/src/shared/mount-util.c index 366f59ee82..61144ce0b6 100644 --- a/src/shared/mount-util.c +++ b/src/shared/mount-util.c @@ -459,7 +459,7 @@ static int mount_switch_root_pivot(int fd_newroot, const char *path) { /* Change into the new rootfs. */ if (fchdir(fd_newroot) < 0) - return log_debug_errno(errno, "Failed to change into new rootfs '%s': %m", path); + return log_debug_errno(errno, "Failed to chdir into new rootfs '%s': %m", path); /* Let the kernel tuck the new root under the old one. */ if (pivot_root(".", ".") < 0) @@ -479,13 +479,13 @@ static int mount_switch_root_move(int fd_newroot, const char *path) { /* Change into the new rootfs. */ if (fchdir(fd_newroot) < 0) - return log_debug_errno(errno, "Failed to change into new rootfs '%s': %m", path); + return log_debug_errno(errno, "Failed to chdir into new rootfs '%s': %m", path); /* Move the new root fs */ if (mount(".", "/", NULL, MS_MOVE, NULL) < 0) return log_debug_errno(errno, "Failed to move new rootfs '%s': %m", path); - /* Also change chroot dir */ + /* Also change root dir */ if (chroot(".") < 0) return log_debug_errno(errno, "Failed to chroot to new rootfs '%s': %m", path);