diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-10-26 13:21:41 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-10-26 13:21:41 +0100 |
| commit | ad1a44b23bbc909aa3f5876dadd482a9f6c18d5c (patch) | |
| tree | 97fc092ae75eddafb746b58d2254c6af953f1e9e /src/core/mount.c | |
| parent | 0dec689b098cf62b948d43dc78bde859665056ec (diff) | |
| parent | 4d0d3d41d21f34f28ee67b8b1952af88ada7abaf (diff) | |
Merge pull request #1676 from poettering/util-lib-2
split up util.[ch] into more pieces, and other stuff
Diffstat (limited to 'src/core/mount.c')
| -rw-r--r-- | src/core/mount.c | 12 |
1 files changed, 6 insertions, 6 deletions
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; |