SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4510 from keszybz/tree-wide-cleanups

Browse Source 
Tree wide cleanups
This commit is contained in:
Lennart Poettering
2016-11-03 13:59:20 -06:00
committed by GitHub
parent a1e2ef7ec9 9aa2169eae
commit 493fd52f1a
91 changed files with 337 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nspawn/nspawn-mount.c
+8 -14
View File
@@ -193,11 +193,9 @@ static int tmpfs_patch_options(
if ((userns && uid_shift != 0) || patch_ids) {
assert(uid_shift != UID_INVALID);
if (options)
(void) asprintf(&buf, "%s,uid=" UID_FMT ",gid=" UID_FMT, options, uid_shift, uid_shift);
else
(void) asprintf(&buf, "uid=" UID_FMT ",gid=" UID_FMT, uid_shift, uid_shift);
if (!buf)
if (asprintf(&buf, "%s%suid=" UID_FMT ",gid=" UID_FMT,
options ?: "", options ? "," : "",
uid_shift, uid_shift) < 0)
return -ENOMEM;
options = buf;
@@ -207,16 +205,12 @@ static int tmpfs_patch_options(
if (selinux_apifs_context) {
char *t;
if (options)
t = strjoin(options, ",context=\"", selinux_apifs_context, "\"", NULL);
else
t = strjoin("context=\"", selinux_apifs_context, "\"", NULL);
if (!t) {
free(buf);
return -ENOMEM;
}
t = strjoin(options ?: "", options ? "," : "",
"context=\"", selinux_apifs_context, "\"");
free(buf);
if (!t)
return -ENOMEM;
buf = t;
}
#endif
src/nspawn/nspawn.c
+2 -2
View File
@@ -2547,7 +2547,7 @@ static int determine_names(void) {
* search for a machine, but instead create a new one
* in /var/lib/machine. */
arg_directory = strjoin("/var/lib/machines/", arg_machine, NULL);
arg_directory = strjoin("/var/lib/machines/", arg_machine);
if (!arg_directory)
return log_oom();
}
@@ -3390,7 +3390,7 @@ static int load_settings(void) {
FOREACH_STRING(i, "/etc/systemd/nspawn", "/run/systemd/nspawn") {
_cleanup_free_ char *j = NULL;
j = strjoin(i, "/", fn, NULL);
j = strjoin(i, "/", fn);
if (!j)
return log_oom();