From 254224ed41b2e8b08b32029dfa8437a37003e1e9 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 1 Nov 2023 16:59:56 -0400 Subject: [PATCH 1/2] install: Just no-op with `--auto` if no components This is part of being a no-op on s390x. --- src/bootupd.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootupd.rs b/src/bootupd.rs index bbb771916..f6c92475f 100644 --- a/src/bootupd.rs +++ b/src/bootupd.rs @@ -61,7 +61,7 @@ pub(crate) fn install( all_components.values().collect() }; - if target_components.is_empty() { + if target_components.is_empty() && !auto_components { anyhow::bail!("No components specified"); } From e81c38ecded27c118bb259cd468b4853bcc276d3 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 2 Nov 2023 10:07:21 -0400 Subject: [PATCH 2/2] No-op static configs on s390x Nothing to do there. --- src/bootupd.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/bootupd.rs b/src/bootupd.rs index f6c92475f..560f38bf4 100644 --- a/src/bootupd.rs +++ b/src/bootupd.rs @@ -90,7 +90,13 @@ pub(crate) fn install( let sysroot = &openat::Dir::open(dest_root)?; if with_static_configs { + #[cfg(any( + target_arch = "x86_64", + target_arch = "aarch64", + target_arch = "powerpc64" + ))] crate::grubconfigs::install(sysroot, installed_efi)?; + // On other architectures, assume that there's nothing to do. } // Unmount the ESP, etc.