Merge pull request #8929 from thebeanogamer/fix/main/pup11603

(PUP-110603) Mark ZFS as an SELinux-Capable Filesystem

Author: cthorn42

lib/puppet/util/selinux.rb

@@ -204,7 +204,7 @@ def selinux_category_to_label(category)
   def selinux_label_support?(file)
     fstype = find_fs(file)
     return false if fstype.nil?
-    filesystems = ['ext2', 'ext3', 'ext4', 'gfs', 'gfs2', 'xfs', 'jfs', 'btrfs', 'tmpfs']
+    filesystems = ['ext2', 'ext3', 'ext4', 'gfs', 'gfs2', 'xfs', 'jfs', 'btrfs', 'tmpfs', 'zfs']
     filesystems.include?(fstype)
   end
 

spec/unit/util/selinux_spec.rb

@@ -65,6 +65,7 @@
         '/'        => 'ext3',
         '/sys'     => 'sysfs',
         '/mnt/nfs' => 'nfs',
+        '/mnt/zfs' => 'zfs',
         '/proc'    => 'proc',
         '/dev'     => 'tmpfs' })
     end
@@ -85,6 +86,10 @@
       expect(selinux_label_support?('/dev/shm/testfile')).to be_truthy
     end
 
+    it "should return true if zfs" do
+      expect(selinux_label_support?('/mnt/zfs/testfile')).to be_truthy
+    end
+
     it "should return false for a noncapable filesystem" do
       expect(selinux_label_support?('/mnt/nfs/testfile')).to be_falsey
     end