@@ -14,3 +14,3 @@
 const IMAGE_DIRECTORY: &str = "/run/citadel/images";
 
-pub fn live_rootfs() -> Result<()> {
+pub fn live_rootfs() -> Result<(), Box<dyn std::error::Error>> {

@@ -61,3 +60,3 @@
 }
 
-fn kernel_version() -> String {
+fn kernel_version() -> Result<String, Box<dyn std::error::Error>> {

@@ -129,3 +129,3 @@
         }
     }
-    bail!("unable to find rootfs resource image in {}", IMAGE_DIRECTORY)
+    Result::Err(

@@ -27,4 +26,1 @@
 
-    if let Err(ref e) = result {
-        warn!("Failed: {}", e);
-        exit(1);

@@ -22,4 +21,4 @@
         Some(s) if s == "setup" => do_setup(),
         Some(s) if s == "boot-automount" => do_boot_automount(),
         Some(s) if s == "start-realms" => do_start_realms(),
         _ => Err(format_err!("Bad or missing argument").into()),

@@ -37,3 +32,3 @@
         live::live_rootfs()
     } else {
-        rootfs::setup_rootfs()
+        Ok(rootfs::setup_rootfs()?)

@@ -138,3 +147,2 @@
     // Compare versions and channels
-    let a_v = a.metainfo().version();
-    let b_v = b.metainfo().version();
+    let meta_a = a.metainfo();

@@ -162,3 +163,3 @@
     let path = arg_matches.value_of("path").expect("path argument missing");
     if !Path::new(path).exists() {
-        bail!("Cannot load image {}: File does not exist", path);
+        panic!("Cannot load image {}: File does not exist", path);

@@ -509,2 +509,2 @@
-            ("$TARGET", self.target_str())
-        ])
+    pub fn finish_install(&self) -> Result<(), Box<dyn std::error::Error>> {
+        self.cmd_list(FINISH_COMMANDS, &[("$TARGET", self.target_str())])