Move selinux-related stuff from btrfs-util.c to label.c

In preparation for future changes.

diff --git a/src/basic/label.c b/src/basic/label.c
index 17857de1b2e9916a1a01afde987550239e4d5a1a..8a2d87818befb0a3c895371fff7113bed2136d63 100644 (file)
--- a/src/basic/label.c
+++ b/src/basic/label.c
@@ -22,6 +22,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+//#include "btrfs-util.h"
 #include "label.h"
 #include "macro.h"
 #include "selinux-util.h"
@@ -83,3 +84,21 @@ int symlink_label(const char *old_path, const char *new_path) {
         return mac_smack_fix(new_path, false, false);
 }
 #endif // 0
+
+int btrfs_subvol_make_label(const char *path) {
+        int r;
+
+        assert(path);
+
+        r = mac_selinux_create_file_prepare(path, S_IFDIR);
+        if (r < 0)
+                return r;
+
+        r = btrfs_subvol_make(path);
+        mac_selinux_create_file_clear();
+
+        if (r < 0)
+                return r;
+
+        return mac_smack_fix(path, false, false);
+}

diff --git a/src/basic/label.h b/src/basic/label.h
index fa49c2e201fe7f7e282b75fece2b3d3440793dd8..df25d8bafe42ed7aaae4bc9d65737a8c857012ea 100644 (file)
--- a/src/basic/label.h
+++ b/src/basic/label.h
@@ -29,3 +29,5 @@ int mkdir_label(const char *path, mode_t mode);
 #if 0 /// UNNEEDED by elogind
 int symlink_label(const char *old_path, const char *new_path);
 #endif // 0
+
+int btrfs_subvol_make_label(const char *path);