use option rather than an enum

Signed-off-by: Gareth Widlansky <gareth.widlansky@proton.me>

Author: Gareth Widlansky

crates/lib/src/bootc_composefs/boot.rs

@@ -1144,17 +1144,17 @@ pub(crate) fn setup_composefs_uki_boot(
     Ok(())
 }
 
-pub enum AutoEnroll {
-    None,
-    Keys { dir: Dir, keys: Vec<Utf8PathBuf> },
+pub struct AutoEnroll {
+    pub dir: Dir,
+    pub keys: Vec<Utf8PathBuf>,
 }
 
-fn get_systemd_boot_autoenroll(fs: &Dir, p: &str) -> Result<AutoEnroll> {
+fn get_systemd_boot_autoenroll(fs: &Dir, p: &str) -> Result<Option<AutoEnroll>> {
     let mut entries = vec![];
 
     let keys_dir = match fs.open_dir(p) {
         Ok(d) => d,
-        Err(_) => return Ok(AutoEnroll::None), // if the directory doesn't exist it just means we don't have any keys to enroll
+        Err(_) => return Ok(None), // if the directory doesn't exist it just means we don't have any keys to enroll
     };
 
     for entry in keys_dir.entries()? {
@@ -1176,12 +1176,12 @@ fn get_systemd_boot_autoenroll(fs: &Dir, p: &str) -> Result<AutoEnroll> {
         entries.push(path);
     }
     if entries.len() > 0 {
-        return Ok(AutoEnroll::Keys {
+        return Ok(Some(AutoEnroll {
             dir: keys_dir,
             keys: entries,
-        });
+        }));
     }
-    return Ok(AutoEnroll::None);
+    return Ok(None);
 }
 
 #[context("Setting up composefs boot")]

crates/lib/src/bootloader.rs

@@ -78,7 +78,7 @@ pub(crate) fn install_systemd_boot(
     _rootfs: &Utf8Path,
     _configopts: &crate::install::InstallConfigOpts,
     _deployment_path: Option<&str>,
-    autoenroll: AutoEnroll,
+    autoenroll: Option<AutoEnroll>,
 ) -> Result<()> {
     let esp_part = device
         .find_partition_of_type(discoverable_partition_specification::ESP)
@@ -95,8 +95,8 @@ pub(crate) fn install_systemd_boot(
         .run_inherited_with_cmd_context()?;
 
     match autoenroll {
-        AutoEnroll::None => return Ok(()),
-        AutoEnroll::Keys { dir, keys } => {
+        None => return Ok(()),
+        Some(AutoEnroll { dir, keys }) => {
             println!("Autoenrolling keys");
             let path = esp_path.join(SYSTEMD_AUTOENROLL);
             create_dir_all(&path)?;