Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ just validate-composefs-digest
The `build-sealed` target generates test Secure Boot keys in
`target/test-secureboot/` and builds a complete sealed image with all
the sealed composefs settings. See
[experimental-composefs.md](docs/src/experimental-composefs.md) for
[experimental-composefs.md](docs/src/bootc-experimental-composefs.7.md) for
more information on sealed images.


Expand Down
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,9 @@ install: completion
ln -s "$(STORAGE_RELATIVE_PATH)" "$(DESTDIR)$(prefix)/lib/bootc/storage"
install -D -m 0755 crates/cli/bootc-generator-stub $(DESTDIR)$(prefix)/lib/systemd/system-generators/bootc-systemd-generator
install -d $(DESTDIR)$(prefix)/lib/bootc/install
install -D -m 0644 -t $(DESTDIR)$(prefix)/share/man/man5 target/man/*.5; \
install -D -m 0644 -t $(DESTDIR)$(prefix)/share/man/man8 target/man/*.8; \
install -D -m 0644 -t $(DESTDIR)$(prefix)/share/man/man5 target/man/*.5
install -D -m 0644 -t $(DESTDIR)$(prefix)/share/man/man7 target/man/*.7
install -D -m 0644 -t $(DESTDIR)$(prefix)/share/man/man8 target/man/*.8
install -D -m 0644 target/completion/bootc.bash $(DESTDIR)$(prefix)/share/bash-completion/completions/bootc
install -D -m 0644 target/completion/bootc.elvish $(DESTDIR)$(prefix)/share/elvish/lib/bootc.elv
install -D -m 0644 target/completion/bootc.fish $(DESTDIR)$(prefix)/share/fish/vendor_completions.d/bootc.fish
Expand Down
10 changes: 6 additions & 4 deletions crates/lib/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,14 @@ pub(crate) struct UpgradeOpts {

/// Restart or reboot into the new target image.
///
/// Currently, this always reboots. Future versions may support userspace-only restart.
/// Use --soft-reboot to request a userspace-only restart when supported.
#[clap(long, conflicts_with = "check")]
pub(crate) apply: bool,

/// Configure soft reboot behavior.
///
/// 'required' fails if soft reboot unavailable, 'auto' falls back to regular reboot.
/// 'required' fails if soft reboot is unavailable; 'auto' uses it when possible.
/// See bootc-upgrades(7) for backend-specific fallback behavior.
#[clap(long = "soft-reboot", conflicts_with = "check")]
pub(crate) soft_reboot: Option<SoftRebootMode>,

Expand All @@ -152,13 +153,14 @@ pub(crate) struct SwitchOpts {

/// Restart or reboot into the new target image.
///
/// Currently, this always reboots. Future versions may support userspace-only restart.
/// Use --soft-reboot to request a userspace-only restart when supported.
#[clap(long)]
pub(crate) apply: bool,

/// Configure soft reboot behavior.
///
/// 'required' fails if soft reboot unavailable, 'auto' falls back to regular reboot.
/// 'required' fails if soft reboot is unavailable; 'auto' uses it when possible.
/// See bootc-upgrades(7) for backend-specific fallback behavior.
#[clap(long = "soft-reboot")]
pub(crate) soft_reboot: Option<SoftRebootMode>,

Expand Down
2 changes: 2 additions & 0 deletions crates/xtask/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ xshell = { workspace = true }
# Crate-specific dependencies
cargo_metadata = "0.23"
mandown = "1.1.0"
# Parse source links without round-tripping Markdown through roff/HTML.
pulldown-cmark = "0.13"
rand = "0.10"
serde_yaml = "0.9"
tar = "0.4"
Expand Down
Loading
Loading