summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-10-26 00:45:32 +0100
committerLennart Poettering <lennart@poettering.net>2015-10-26 01:24:39 +0100
commit7cb48925dc9d6c74edcf800b447c6c0c6955687d (patch)
treed24e3dcd824ccf2421ee8c63d498c6ee8d54f240
parent67c7c892b9fcb946792b380a30c4ba704c700934 (diff)
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
-rw-r--r--man/systemd.mount.xml2
-rw-r--r--src/core/dbus-mount.c2
-rw-r--r--src/core/load-fragment-gperf.gperf.m42
-rw-r--r--src/core/mount.c12
-rw-r--r--src/core/mount.h2
-rw-r--r--units/tmp.mount.m42
6 files changed, 11 insertions, 11 deletions
diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
index d3775ff830..aaf2e98175 100644
--- 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 318e81abd6..0c91850c52 100644
--- 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 507cfdde75..c3b48aec4c 100644
--- 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 47dd680b93..ebdb3503e9 100644
--- 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 4e28810f6c..b344b5aa13 100644
--- 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 e1e26bdfc0..6402200c62 100644
--- 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