core: rename SmackFileSystemRoot= to SmackFileSystemRootLabel=

That way it's in sync with the other SMACK label settings.

https://github.com/systemd/systemd/pull/1664#issuecomment-150891270

diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index d3775ff8308707aa77ffbc4106a78a9515c45146..aaf2e98175c23c2c9ad86a33c621720aa87d2cc1 100644 (file)
--- a/man/systemd.mount.xml
+++ b/man/systemd.mount.xml
@@ -324,7 +324,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>SmackFileSystemRoot=</varname></term>
+        <term><varname>SmackFileSystemRootLabel=</varname></term>
         <listitem><para>Takes a string for the smack label.
         This option specifies the label to assign the root of the
         file system if it lacks the Smack extended attribute.

diff --git a/src/core/dbus-mount.c b/src/core/dbus-mount.c
index 318e81abd61e566dd6d8c6cb51ed10780fbb4b34..0c91850c52c6afb8cdb829371c25a450a41baeb7 100644 (file)
--- a/src/core/dbus-mount.c
+++ b/src/core/dbus-mount.c
@@ -118,7 +118,7 @@ const sd_bus_vtable bus_mount_vtable[] = {
         SD_BUS_PROPERTY("ControlPID", "u", bus_property_get_pid, offsetof(Mount, control_pid), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
         SD_BUS_PROPERTY("DirectoryMode", "u", bus_property_get_mode, offsetof(Mount, directory_mode), SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("SloppyOptions", "b", bus_property_get_bool, offsetof(Mount, sloppy_options), SD_BUS_VTABLE_PROPERTY_CONST),
-        SD_BUS_PROPERTY("SmackFileSystemRoot", "s", NULL, offsetof(Mount, smack_fs_root), SD_BUS_VTABLE_PROPERTY_CONST),
+        SD_BUS_PROPERTY("SmackFileSystemRootLabel", "s", NULL, offsetof(Mount, smack_fs_root_label), SD_BUS_VTABLE_PROPERTY_CONST),
         SD_BUS_PROPERTY("Result", "s", property_get_result, offsetof(Mount, result), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
         BUS_EXEC_COMMAND_VTABLE("ExecMount", offsetof(Mount, exec_command[MOUNT_EXEC_MOUNT]), SD_BUS_VTABLE_PROPERTY_EMITS_INVALIDATION),
         BUS_EXEC_COMMAND_VTABLE("ExecUnmount", offsetof(Mount, exec_command[MOUNT_EXEC_UNMOUNT]), SD_BUS_VTABLE_PROPERTY_EMITS_INVALIDATION),

diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
index 507cfdde758dd08bdc7b29c12a935f4bd2f42455..c3b48aec4c73f5e937e46eb4664f24ac5969d4bd 100644 (file)
--- a/src/core/load-fragment-gperf.gperf.m4
+++ b/src/core/load-fragment-gperf.gperf.m4
@@ -319,7 +319,7 @@ Mount.Type,                      config_parse_string,                0,
 Mount.TimeoutSec,                config_parse_sec,                   0,                             offsetof(Mount, timeout_usec)
 Mount.DirectoryMode,             config_parse_mode,                  0,                             offsetof(Mount, directory_mode)
 Mount.SloppyOptions,             config_parse_bool,                  0,                             offsetof(Mount, sloppy_options)
-Mount.SmackFileSystemRoot,       config_parse_string,                0,                             offsetof(Mount, smack_fs_root)
+Mount.SmackFileSystemRootLabel,  config_parse_string,                0,                             offsetof(Mount, smack_fs_root_label)
 EXEC_CONTEXT_CONFIG_ITEMS(Mount)m4_dnl
 CGROUP_CONTEXT_CONFIG_ITEMS(Mount)m4_dnl
 KILL_CONTEXT_CONFIG_ITEMS(Mount)m4_dnl

diff --git a/src/core/mount.c b/src/core/mount.c
index 47dd680b93689d4b08b512e8dab107ad85ad9ac4..ebdb3503e9b50db521e82784ea97bcf1cdb186f8 100644 (file)
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -206,7 +206,7 @@ static void mount_done(Unit *u) {
         assert(m);
 
         m->where = mfree(m->where);
-        m->smack_fs_root = mfree(m->smack_fs_root);
+        m->smack_fs_root_label = mfree(m->smack_fs_root_label);
 
         mount_parameters_done(&m->parameters_proc_self_mountinfo);
         mount_parameters_done(&m->parameters_fragment);
@@ -672,7 +672,7 @@ static void mount_dump(Unit *u, FILE *f, const char *prefix) {
                 "%sFrom /proc/self/mountinfo: %s\n"
                 "%sFrom fragment: %s\n"
                 "%sDirectoryMode: %04o\n"
-                "%sSmackFileSystemRoot: %s\n",
+                "%sSmackFileSystemRootLabel: %s\n",
                 prefix, mount_state_to_string(m->state),
                 prefix, mount_result_to_string(m->result),
                 prefix, m->where,
@@ -682,7 +682,7 @@ static void mount_dump(Unit *u, FILE *f, const char *prefix) {
                 prefix, yes_no(m->from_proc_self_mountinfo),
                 prefix, yes_no(m->from_fragment),
                 prefix, m->directory_mode,
-                prefix, strna(m->smack_fs_root));
+                prefix, strna(m->smack_fs_root_label));
 
         if (m->control_pid > 0)
                 fprintf(f,
@@ -868,12 +868,12 @@ static int mount_get_opts(Mount *m, char **_opts) {
         if (r < 0)
                 return r;
 
-        if (mac_smack_use() && m->smack_fs_root) {
+        if (mac_smack_use() && m->smack_fs_root_label) {
                 if (!isempty(o)) {
-                        opts = strjoin(o, ",", "smackfsroot=", m->smack_fs_root, NULL);
+                        opts = strjoin(o, ",", "smackfsroot=", m->smack_fs_root_label, NULL);
                         free(o);
                 } else
-                        opts = strjoin("smackfsroot=", m->smack_fs_root, NULL);
+                        opts = strjoin("smackfsroot=", m->smack_fs_root_label, NULL);
 
                 if (!opts)
                         return -ENOMEM;

diff --git a/src/core/mount.h b/src/core/mount.h
index 4e28810f6ccc4358be4c7600c1d7f4c5308332a2..b344b5aa13e29af882d3bef5cf8284b09d060e84 100644 (file)
--- a/src/core/mount.h
+++ b/src/core/mount.h
@@ -71,7 +71,7 @@ struct Mount {
         bool reset_cpu_usage:1;
 
         bool sloppy_options;
-        char *smack_fs_root;
+        char *smack_fs_root_label;
 
         MountResult result;
         MountResult reload_result;

diff --git a/units/tmp.mount.m4 b/units/tmp.mount.m4
index e1e26bdfc0d93edd6b8c455e9ce7cf890cc48047..6402200c62e75b15f52bfb62ed59d59de557c098 100644 (file)
--- a/units/tmp.mount.m4
+++ b/units/tmp.mount.m4
@@ -20,5 +20,5 @@ Where=/tmp
 Type=tmpfs
 Options=mode=1777,strictatime
 m4_ifdef(`HAVE_SMACK',
-SmackFileSystemRoot=*
+SmackFileSystemRootLabel=*
 )m4_dnl