Merge pull request #845 from bmr-cymru/bmr-private-devices

Make internal devices private by default
stratis-storage · Apr 3, 2023 · f1e7b7d · f1e7b7d
2 parents 30bb9dd + e4c7089
commit f1e7b7d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/src/cachedev.rs b/src/cachedev.rs
@@ -573,7 +573,7 @@ impl CacheDev {
         }
 
         let table = CacheDev::gen_default_table(&meta, &cache, &origin, cache_block_size);
-        let dev_info = device_create(dm, name, uuid, &table, DmOptions::default())?;
+        let dev_info = device_create(dm, name, uuid, &table, DmOptions::private())?;
 
         Ok(CacheDev {
             dev_info: Box::new(dev_info),
@@ -607,7 +607,7 @@ impl CacheDev {
             device_match(dm, &dev, uuid)?;
             dev
         } else {
-            let dev_info = device_create(dm, name, uuid, &table, DmOptions::default())?;
+            let dev_info = device_create(dm, name, uuid, &table, DmOptions::private())?;
             CacheDev {
                 dev_info: Box::new(dev_info),
                 meta_dev: meta,

diff --git a/src/core/dm_options.rs b/src/core/dm_options.rs
@@ -34,4 +34,13 @@ impl DmOptions {
     pub fn udev_flags(&self) -> DmUdevFlags {
         self.udev_flags
     }
+
+    /// Set default udev flags for a private (internal) device.
+    pub fn private() -> DmOptions {
+        DmOptions::default().set_udev_flags(
+            DmUdevFlags::DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG
+                | DmUdevFlags::DM_UDEV_DISABLE_DISK_RULES_FLAG
+                | DmUdevFlags::DM_UDEV_DISABLE_OTHER_RULES_FLAG,
+        )
+    }
 }
diff --git a/src/lineardev.rs b/src/lineardev.rs
@@ -539,7 +539,7 @@ impl LinearDev {
             device_match(dm, &dev, uuid)?;
             dev
         } else {
-            let dev_info = device_create(dm, name, uuid, &table, DmOptions::default())?;
+            let dev_info = device_create(dm, name, uuid, &table, DmOptions::private())?;
             LinearDev {
                 dev_info: Box::new(dev_info),
                 table,

diff --git a/src/thinpooldev.rs b/src/thinpooldev.rs
@@ -457,7 +457,7 @@ impl ThinPoolDev {
 
         let table =
             ThinPoolDev::gen_table(&meta, &data, data_block_size, low_water_mark, feature_args);
-        let dev_info = device_create(dm, name, uuid, &table, DmOptions::default())?;
+        let dev_info = device_create(dm, name, uuid, &table, DmOptions::private())?;
 
         Ok(ThinPoolDev {
             dev_info: Box::new(dev_info),
@@ -512,7 +512,7 @@ impl ThinPoolDev {
             device_match(dm, &dev, uuid)?;
             dev
         } else {
-            let dev_info = device_create(dm, name, uuid, &table, DmOptions::default())?;
+            let dev_info = device_create(dm, name, uuid, &table, DmOptions::private())?;
             ThinPoolDev {
                 dev_info: Box::new(dev_info),
                 meta_dev: meta,