picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

core: rename SmackFileSystemRoot= to SmackFileSystemRootLabel=

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

https://github.com/systemd/systemd/pull/1664#issuecomment-150891270
This commit is contained in:
Lennart Poettering 2015-10-26 00:45:32 +01:00
parent 67c7c892b9
commit 7cb48925dc
6 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
man/systemd.mount.xml
View file

@ -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.

2
src/core/dbus-mount.c
View file

@ -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),

2
src/core/load-fragment-gperf.gperf.m4
View file

@ -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

12
src/core/mount.c
View file

@ -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;

2
src/core/mount.h
View file

@ -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;

2
units/tmp.mount.m4
View file

@ -20,5 +20,5 @@ Where=/tmp
Type=tmpfs
Options=mode=1777,strictatime
m4_ifdef(`HAVE_SMACK',
SmackFileSystemRoot=*
SmackFileSystemRootLabel=*
)m4_dnl