Skip to content

Un-hide soft-reboot #1580

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

Merged
merged 1 commit into from
Sep 3, 2025
Merged

Un-hide soft-reboot #1580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions crates/lib/src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,7 @@ pub(crate) struct UpgradeOpts {
///
/// 'required' will fail if soft reboot is not available.
/// 'auto' will use soft reboot if available, otherwise fall back to regular reboot.
// Hidden because the ostree side needs further stabilization.
// See: https://github.com/ostreedev/ostree/issues/3503
#[clap(long = "soft-reboot", conflicts_with = "check", hide = true)]
#[clap(long = "soft-reboot", conflicts_with = "check")]
pub(crate) soft_reboot: Option<SoftRebootMode>,

#[clap(flatten)]
Expand All @@ -113,9 +111,7 @@ pub(crate) struct SwitchOpts {
///
/// 'required' will fail if soft reboot is not available.
/// 'auto' will use soft reboot if available, otherwise fall back to regular reboot.
// Hidden because the ostree side needs further stabilization.
// See: https://github.com/ostreedev/ostree/issues/3503
#[clap(long = "soft-reboot", hide = true)]
#[clap(long = "soft-reboot")]
pub(crate) soft_reboot: Option<SoftRebootMode>,

/// The transport; e.g. oci, oci-archive, containers-storage. Defaults to `registry`.
Expand Down Expand Up @@ -166,9 +162,7 @@ pub(crate) struct RollbackOpts {
///
/// 'required' will fail if soft reboot is not available.
/// 'auto' will use soft reboot if available, otherwise fall back to regular reboot.
// Hidden because the ostree side needs further stabilization.
// See: https://github.com/ostreedev/ostree/issues/3503
#[clap(long = "soft-reboot", hide = true)]
#[clap(long = "soft-reboot")]
pub(crate) soft_reboot: Option<SoftRebootMode>,
}

Expand Down
3 changes: 3 additions & 0 deletions tmt/tests/booted/readonly/002-test-cli.nu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,7 @@ tap begin "verify bootc status output formats"

assert equal (bootc switch blah:// e>| find "\u{1B}") []

# Verify soft-reboot is in help
bootc upgrade --help | grep -qF -e '--soft-reboot'

tap ok