diff --git a/lib/src/install.rs b/lib/src/install.rs index 9b2044f57..27eddf129 100644 --- a/lib/src/install.rs +++ b/lib/src/install.rs @@ -630,8 +630,8 @@ pub(crate) struct RootSetup { rootfs: Utf8PathBuf, rootfs_fd: Dir, rootfs_uuid: Option, - /// If true, do not try to remount the root read-only and flush the journal, etc. - skip_finalize: bool, + /// True if this is an "alongside" install where we didn't create the filesystem + is_alongside: bool, boot: Option, kargs: Vec, } @@ -876,7 +876,7 @@ async fn install_to_filesystem_impl(state: &State, rootfs: &mut RootSetup) -> Re .run()?; // Finalize mounted filesystems - if !rootfs.skip_finalize { + if !rootfs.is_alongside { let bootfs = rootfs.rootfs.join("boot"); for fs in [bootfs.as_path(), rootfs.rootfs.as_path()] { finalize_filesystem(fs)?; @@ -1106,7 +1106,7 @@ pub(crate) async fn install_to_filesystem(opts: InstallToFilesystemOpts) -> Resu rootfs_uuid: inspect.uuid.clone(), boot, kargs, - skip_finalize: matches!(fsopts.replace, Some(ReplaceMode::Alongside)), + is_alongside: matches!(fsopts.replace, Some(ReplaceMode::Alongside)), }; install_to_filesystem_impl(&state, &mut rootfs).await?; diff --git a/lib/src/install/baseline.rs b/lib/src/install/baseline.rs index 9eeb1cd78..e6875cb3c 100644 --- a/lib/src/install/baseline.rs +++ b/lib/src/install/baseline.rs @@ -387,6 +387,6 @@ pub(crate) fn install_create_rootfs( rootfs_uuid: Some(root_uuid.to_string()), boot: Some(boot), kargs, - skip_finalize: false, + is_alongside: false, }) }