wip, saving in case of rollback

Signed-off-by: djach7 <[email protected]>

Author: djach7

lib/src/blockdev.rs

@@ -54,17 +54,29 @@ impl Device {
     pub(crate) fn is_mounted_in_pid_mounts(&self, pid: rustix::process::Pid) -> Result<bool> {
         let output = Command::new("findmnt")
             .arg("-N")
-            .arg((pid.as_raw_nonzero()).to_string())
-            .arg("-S")
-            .arg(self.path())
+            //.arg((pid.as_raw_nonzero()).to_string())
+            .arg("1")
+            //.arg("-S")
+            //.arg("/dev/vdb3")
+            //.arg(self.path())
+            .arg("--output=SOURCE")
             .output()
             .expect("Failed to execute findmnt");
 
+        // findmnt -N 1 --output=SOURCE
+
         let mounts = String::from_utf8(output.stdout).unwrap();
 
-        let mounts_present = mounts.is_empty();
+        let mut mounts_present = false;
+
+        if mounts.contains(&self.path()) {
+        //if mounts.contains("/dev/vdb3") { 
+            mounts_present = true;
+        }
+
+        println!("{mounts}");
 
-        Ok(!mounts_present)
+        Ok(mounts_present)
     }
 
     // The "start" parameter was only added in a version of util-linux that's only

lib/src/install/baseline.rs

@@ -162,6 +162,12 @@ pub(crate) fn install_create_rootfs(
     // Canonicalize devpath
     let devpath: Utf8PathBuf = device.path().into();
 
+    // Always disallow writing to mounted device
+    if device.is_mounted_in_pid_mounts(rustix::process::getpid()).expect("Failed to check mountpoints") {
+        println!("{:?}", rustix::process::getpid());
+        anyhow::bail!("Device {} is mounted", device.path())
+    }
+
     // Handle wiping any existing data
     if opts.wipe {
         let dev = &opts.device;
@@ -179,11 +185,6 @@ pub(crate) fn install_create_rootfs(
         );
     }
 
-    // Always disallow writing to mounted device
-    if device.is_mounted_in_pid_mounts(rustix::process::getpid()).expect("Failed to check mountpoints") {
-        anyhow::bail!("Device {} is mounted", device.path())
-    }
-
     let run_bootc = Utf8Path::new(RUN_BOOTC);
     let mntdir = run_bootc.join("mounts");
     if mntdir.exists() {