Skip to content

Commit 8a90c4b

Browse files
martinezjavierckyrouac
authored andcommitted
install: Don't restrict bootloader option to the composefs backend
This command line argument can be also be used by the ostree backend. For example, when using Android Boot Images (aboot) there is a need to avoid calling to bootupd since all the boot setup is managed outside of bootc. A future change will add a bootloader=none option to force this behavior. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
1 parent c26ae5a commit 8a90c4b

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

crates/lib/src/install.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,11 @@ pub(crate) struct InstallConfigOpts {
373373
#[clap(long)]
374374
#[serde(default)]
375375
pub(crate) bootupd_skip_boot_uuid: bool,
376+
377+
/// The bootloader to use.
378+
#[clap(long)]
379+
#[serde(default)]
380+
pub(crate) bootloader: Option<Bootloader>,
376381
}
377382

378383
#[derive(Debug, Default, Clone, clap::Parser, Serialize, Deserialize, PartialEq, Eq)]
@@ -387,11 +392,6 @@ pub(crate) struct InstallComposefsOpts {
387392
#[serde(default)]
388393
pub(crate) insecure: bool,
389394

390-
/// The bootloader to use.
391-
#[clap(long, requires = "composefs_backend")]
392-
#[serde(default)]
393-
pub(crate) bootloader: Option<Bootloader>,
394-
395395
/// Name of the UKI addons to install without the ".efi.addon" suffix.
396396
/// This option can be provided multiple times if multiple addons are to be installed.
397397
#[clap(long, requires = "composefs_backend")]
@@ -1695,7 +1695,7 @@ impl PostFetchState {
16951695
// Determine bootloader type for the target system
16961696
// Priority: user-specified > bootupd availability > systemd-boot fallback
16971697
let detected_bootloader = {
1698-
if let Some(bootloader) = state.composefs_options.bootloader.clone() {
1698+
if let Some(bootloader) = state.config_opts.bootloader.clone() {
16991699
bootloader
17001700
} else {
17011701
if crate::bootloader::supports_bootupd(d)? {

0 commit comments

Comments
 (0)