Skip to content

Commit e027514

Browse files
committed
Un-hide soft-reboot
We debugged ostreedev/ostree#3503 and it's basically a systemd/Anaconda bug. So we can consider soft reboots an available feature from our end (as systemd does), but certainly one that will require integration testing on the OS/distro side. If you're building a system and you don't want to enable soft reboots, just `rm /usr/lib/systemd/system/soft-reboot.target` or so should do the trick. Signed-off-by: Colin Walters <[email protected]>
1 parent fbd06e8 commit e027514

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

crates/lib/src/cli.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ pub(crate) struct UpgradeOpts {
8585
///
8686
/// 'required' will fail if soft reboot is not available.
8787
/// 'auto' will use soft reboot if available, otherwise fall back to regular reboot.
88-
// Hidden because the ostree side needs further stabilization.
89-
// See: https://github.com/ostreedev/ostree/issues/3503
90-
#[clap(long = "soft-reboot", conflicts_with = "check", hide = true)]
88+
#[clap(long = "soft-reboot", conflicts_with = "check")]
9189
pub(crate) soft_reboot: Option<SoftRebootMode>,
9290

9391
#[clap(flatten)]
@@ -115,7 +113,7 @@ pub(crate) struct SwitchOpts {
115113
/// 'auto' will use soft reboot if available, otherwise fall back to regular reboot.
116114
// Hidden because the ostree side needs further stabilization.
117115
// See: https://github.com/ostreedev/ostree/issues/3503
118-
#[clap(long = "soft-reboot", hide = true)]
116+
#[clap(long = "soft-reboot")]
119117
pub(crate) soft_reboot: Option<SoftRebootMode>,
120118

121119
/// The transport; e.g. oci, oci-archive, containers-storage. Defaults to `registry`.
@@ -168,7 +166,7 @@ pub(crate) struct RollbackOpts {
168166
/// 'auto' will use soft reboot if available, otherwise fall back to regular reboot.
169167
// Hidden because the ostree side needs further stabilization.
170168
// See: https://github.com/ostreedev/ostree/issues/3503
171-
#[clap(long = "soft-reboot", hide = true)]
169+
#[clap(long = "soft-reboot")]
172170
pub(crate) soft_reboot: Option<SoftRebootMode>,
173171
}
174172

tmt/tests/booted/readonly/002-test-cli.nu

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,7 @@ tap begin "verify bootc status output formats"
55

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

8+
# Verify soft-reboot is in help
9+
bootc upgrade --help | grep -qF -e '--soft-reboot'
10+
811
tap ok

0 commit comments

Comments
 (0)