Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More image output cleanup #399

Merged
merged 2 commits into from
Mar 19, 2024
Merged

More image output cleanup #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
893591f
deploy: Use alternative format for staging
cgwalters Mar 18, 2024
38296ea
install: Clean up image output more
cgwalters Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/src/deploy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ pub(crate) async fn stage(
)
.await?;
crate::deploy::cleanup(sysroot).await?;
println!("Queued for next boot: {}", spec.image);
println!("Queued for next boot: {:#}", spec.image);
if let Some(version) = image.version.as_deref() {
println!(" Version: {version}");
}
Expand Down
12 changes: 6 additions & 6 deletions lib/src/install.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,13 +610,10 @@ async fn initialize_ostree_root_from_self(
options.kargs = Some(kargs.as_slice());
options.target_imgref = Some(&state.target_imgref);
options.proxy_cfg = proxy_cfg;
println!("Creating initial deployment");
let target_image = state.target_imgref.to_string();
println!("Deploying container image");
let imgstate =
ostree_container::deploy::deploy(&sysroot, stateroot, &src_imageref, Some(options)).await?;
let digest = imgstate.manifest_digest.as_str();
println!("Installed: {target_image}");
println!(" Digest: {digest}");
println!("Deployment complete");

// Write the entry for /boot to /etc/fstab. TODO: Encourage OSes to use the karg?
// Or better bind this with the grub data.
Expand Down Expand Up @@ -1031,7 +1028,10 @@ async fn prepare_install(
let (override_disable_selinux, setenforce_guard) =
reexecute_self_for_selinux_if_needed(&source, config_opts.disable_selinux)?;

println!("Installing: {:#}", &target_imgref);
println!("Installing image: {:#}", &target_imgref);
if let Some(digest) = source.digest.as_deref() {
println!("Digest: {digest}");
}

let install_config = config::load_config()?;
tracing::debug!("Loaded install configuration");
Expand Down