Merge pull request #222 from desultory/dev

stop if mounts are detected in the build dir

src/ugrd/base/core.py

@@ -42,9 +42,16 @@ def get_shell(self) -> None:
 
 @contains("clean", "Skipping cleaning build directory", log_level=30)
 def clean_build_dir(self) -> None:
-    """Cleans the build directory."""
+    """Cleans the build directory.
+    Ensures there are no active mounts in the build directory.
+    """
     build_dir = self._get_build_path("/")
 
+    if any(mount.startswith(str(build_dir)) for mount in self["_mounts"]):
+        self.logger.critical("Mount detected in build directory, stopping: %s" % build_dir)
+        self.logger.critical("Active mounts: %s" % self["_mounts"])
+        exit(1)
+
     if build_dir.is_dir():
         self.logger.warning("Cleaning build directory: %s" % colorize(build_dir, "yellow"))
         rmtree(build_dir)

src/ugrd/base/test.toml

@@ -2,7 +2,7 @@ test_rootfs_name = 'ugrd-test-rootfs'
 test_rootfs_build_dir = 'initramfs_test_rootfs'
 test_image_size = 16
 
-test_copy_config = ["mounts", "out_dir", "tmpdir", "clean", "test_image_size", "test_flag", "cryptsetup"]
+test_copy_config = ["_mounts", "mounts", "out_dir", "tmpdir", "clean", "test_image_size", "test_flag", "cryptsetup"]
 
 test_memory = '256M'
 test_cpu = 'host'

src/ugrd/fs/mounts.py

@@ -1,5 +1,5 @@
 __author__ = "desultory"
-__version__ = "6.6.3"
+__version__ = "6.6.4"
 
 from pathlib import Path
 from re import search
@@ -327,13 +327,15 @@ def umount_fstab(self) -> list[str]:
     return out
 
 
-@contains("hostonly", "Skipping mount autodetection, hostonly mode is disabled.", log_level=30)
 def get_mounts_info(self) -> None:
     """Gets the mount info for all devices."""
-    with open("/proc/mounts", "r") as mounts:
-        for line in mounts:
-            device, mountpoint, fstype, options, _, _ = line.split()
-            self["_mounts"][mountpoint] = {"device": device, "fstype": fstype, "options": options.split(",")}
+    try:
+        with open("/proc/mounts", "r") as mounts:
+            for line in mounts:
+                device, mountpoint, fstype, options, _, _ = line.split()
+                self["_mounts"][mountpoint] = {"device": device, "fstype": fstype, "options": options.split(",")}
+    except FileNotFoundError:
+        self.logger.critical("Failed to get mount info, detection and validation may fail!!!")
 
     self.logger.debug("Mount info: %s" % pretty_print(self["_mounts"]))
 

src/ugrd/fs/test_image.toml

@@ -14,6 +14,7 @@ _cryptsetup_root = "root"
 
 [custom_parameters]
 shebang = "str"  # Add the shebang property, because the test mode disables the base module
+_mounts = "dict"  # For build dir check
 mounts = "dict"  # We only need the mounts dict, not the whole module
 cryptsetup = "dict"  # Same as above
 _cryptsetup_root = "str"  # Define the root device for cryptsetup