Merge pull request #65 from cgwalters/bootupd-bios

bootloader: Switch to using bootupd to do BIOS

Author: cgwalters

lib/src/bootloader.rs

@@ -5,6 +5,7 @@ use camino::Utf8Path;
 use cap_std::fs::Dir;
 use cap_std::fs::Permissions;
 use cap_std_ext::cap_std;
+use cap_std_ext::cap_std::fs::DirBuilder;
 use cap_std_ext::prelude::*;
 use fn_error_context::context;
 
@@ -58,21 +59,30 @@ pub(crate) fn install_via_bootupd(
     Task::new_and_run(
         "Running bootupctl to install bootloader",
         "bootupctl",
-        ["backend", "install", "--src-root", "/", rootfs.as_str()],
+        [
+            "backend",
+            "install",
+            "--src-root",
+            "/",
+            "--device",
+            device.as_str(),
+            rootfs.as_str(),
+        ],
     )?;
 
     let grub2_uuid_contents = format!("set BOOT_UUID=\"{boot_uuid}\"\n");
 
     let bootfs = &rootfs.join("boot");
+    let bootfs = Dir::open_ambient_dir(bootfs, cap_std::ambient_authority())?;
 
     {
-        let efidir = Dir::open_ambient_dir(bootfs.join("efi"), cap_std::ambient_authority())?;
+        let efidir = bootfs.open_dir("efi")?;
         install_grub2_efi(&efidir, &grub2_uuid_contents)?;
     }
 
-    let grub2 = &bootfs.join("grub2");
-    std::fs::create_dir(grub2).context("creating boot/grub2")?;
-    let grub2 = Dir::open_ambient_dir(grub2, cap_std::ambient_authority())?;
+    bootfs.ensure_dir_with("grub2", &DirBuilder::new())?;
+    let grub2 = bootfs.open_dir("grub2")?;
+
     // Mode 0700 to support passwords etc.
     grub2.set_permissions(".", Permissions::from_mode(0o700))?;
     grub2
@@ -91,17 +101,5 @@ pub(crate) fn install_via_bootupd(
         )
         .with_context(|| format!("Writing {GRUB_BOOT_UUID_FILE}"))?;
 
-    Task::new("Installing BIOS grub2", "grub2-install")
-        .args([
-            "--target",
-            "i386-pc",
-            "--boot-directory",
-            bootfs.as_str(),
-            "--modules",
-            "mdraid1x",
-            device.as_str(),
-        ])
-        .run()?;
-
     Ok(())
 }

tests/kolainst/install

@@ -11,7 +11,7 @@
 set -xeuo pipefail
 
 # See https://github.com/cgwalters/bootc-base-images
-IMAGE=quay.io/cgwalters/fedora-oscore:latest
+IMAGE=ghcr.io/cgwalters/fedora-oscore:latest
 # TODO: better detect this, e.g. look for an empty device
 DEV=/dev/vda