install/composefs: Return result from opts.validate

Signed-off-by: Pragyan Poudyal <[email protected]>

Author: Johan-Liebert1

lib/src/install.rs

@@ -560,13 +560,15 @@ impl FromStr for MountSpec {
 }
 
 impl InstallToDiskOpts {
-    pub(crate) fn validate(&self) {
+    pub(crate) fn validate(&self) -> Result<()> {
         if !self.composefs_native {
             // Reject using --boot without --composefs
             if self.composefs_opts.boot != BootType::default() {
-                panic!("--boot must not be provided without --composefs");
+                anyhow::bail!("--boot must not be provided without --composefs");
             }
         }
+
+        Ok(())
     }
 }
 
@@ -1724,7 +1726,7 @@ fn installation_complete() {
 #[context("Installing to disk")]
 #[cfg(feature = "install-to-disk")]
 pub(crate) async fn install_to_disk(mut opts: InstallToDiskOpts) -> Result<()> {
-    opts.validate();
+    opts.validate()?;
 
     let mut block_opts = opts.block_opts;
     let target_blockdev_meta = block_opts