diff options
| author | Lennart Poettering <lennart@poettering.net> | 2023-05-16 05:26:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-16 05:26:48 -0700 |
| commit | 93d4a200fbc1dd741a9971853a5efee7e537cc3e (patch) | |
| tree | 34502b5ad61eed6a53dbd477de25d32bbe5a617c /src/boot/bootctl.c | |
| parent | b10c4acfa38e0b00df4209edfb62ad726ae51084 (diff) | |
| parent | a4b3e9423696f604be33b4ab93c4bb5c6c807554 (diff) | |
| download | systemd-93d4a200fbc1dd741a9971853a5efee7e537cc3e.tar.gz | |
Merge pull request #27648 from poettering/common-dissect-dir
pid1: add common root dir inode to mount disk images to in private namespaces
Diffstat (limited to 'src/boot/bootctl.c')
| -rw-r--r-- | src/boot/bootctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c index 0480e320c0..65608f5e83 100644 --- a/src/boot/bootctl.c +++ b/src/boot/bootctl.c @@ -445,7 +445,7 @@ static int bootctl_main(int argc, char *argv[]) { static int run(int argc, char *argv[]) { _cleanup_(loop_device_unrefp) LoopDevice *loop_device = NULL; - _cleanup_(umount_and_rmdir_and_freep) char *unlink_dir = NULL; + _cleanup_(umount_and_freep) char *mounted_dir = NULL; int r; log_setup(); @@ -493,13 +493,13 @@ static int run(int argc, char *argv[]) { arg_image_policy, DISSECT_IMAGE_GENERIC_ROOT | DISSECT_IMAGE_RELAX_VAR_CHECK, - &unlink_dir, + &mounted_dir, /* ret_dir_fd= */ NULL, &loop_device); if (r < 0) return r; - arg_root = strdup(unlink_dir); + arg_root = strdup(mounted_dir); if (!arg_root) return log_oom(); } |