diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-09-30 12:20:26 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-09-30 12:23:33 +0200 |
| commit | ee30f6ac32d25b7ab975ee5c288cdefb56a83586 (patch) | |
| tree | 7bc42890eb59f249516325e792bbd343bef5dc07 /src/nspawn | |
| parent | eb7ec838600b2749208aab2fc9ff9ad3995f89d9 (diff) | |
| download | systemd-ee30f6ac32d25b7ab975ee5c288cdefb56a83586.tar.gz systemd-ee30f6ac32d25b7ab975ee5c288cdefb56a83586.tar.bz2 systemd-ee30f6ac32d25b7ab975ee5c288cdefb56a83586.zip | |
nspawn: make sure mount_legacy_cgroup_hierarchy() can deal with NULL root directories
Diffstat (limited to 'src/nspawn')
| -rw-r--r-- | src/nspawn/nspawn-mount.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nspawn/nspawn-mount.c b/src/nspawn/nspawn-mount.c index 2bca39f45d..1b1180ea35 100644 --- a/src/nspawn/nspawn-mount.c +++ b/src/nspawn/nspawn-mount.c @@ -534,7 +534,7 @@ static int mount_legacy_cgroup_hierarchy(const char *dest, const char *controlle char *to; int r; - to = strjoina(dest, "/sys/fs/cgroup/", hierarchy); + to = strjoina(strempty(dest), "/sys/fs/cgroup/", hierarchy); r = path_is_mount_point(to, 0); if (r < 0 && r != -ENOENT) |