switch-root: automatically make target switch root dir a mount point

Let's make sure implicitly that the target directory is a mount point,
instead of doing so manually beforehand. This allows us to drop this
step from the transition into the /run/initramfs/ dir at shutdown.

During the initrd→host transition the switch root operations so far
where towards pre-existing mount points, but there are cetrainly
usecases where it might make sense to siwtch into arbitrary
subdirectories, too.
This commit is contained in:
Lennart Poettering
2023-06-02 18:43:10 +02:00
parent f9ad896ee2
commit f717d7a40a
2 changed files with 5 additions and 6 deletions
+5
View File
@@ -66,6 +66,11 @@ int switch_root(const char *new_root,
return 0;
}
/* Make the new root directory a mount point if it isn't */
r = fd_make_mount_point(new_root_fd);
if (r < 0)
return log_error_errno(r, "Failed to make new root directory a mount point: %m");
if (FLAGS_SET(flags, SWITCH_ROOT_DESTROY_OLD_ROOT)) {
istmp = fd_is_temporary_fs(old_root_fd);
if (istmp < 0)
-6
View File
@@ -159,12 +159,6 @@ static int parse_argv(int argc, char *argv[]) {
}
static int switch_root_initramfs(void) {
if (mount("/run/initramfs", "/run/initramfs", NULL, MS_BIND, NULL) < 0)
return log_error_errno(errno, "Failed to mount bind /run/initramfs on /run/initramfs: %m");
if (mount(NULL, "/run/initramfs", NULL, MS_PRIVATE, NULL) < 0)
return log_error_errno(errno, "Failed to make /run/initramfs private mount: %m");
/* Do not detach the old root, because /run/initramfs/shutdown needs to access it.
*
* Disable sync() during switch-root, we after all sync'ed here plenty, and a dumb sync (as opposed