diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2015-10-09 17:32:30 +0200 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2015-10-09 17:32:30 +0200 |
| commit | 88ef5e639b30b53b3663f766874dc519908de74d (patch) | |
| tree | 6d03c9d5d3391283e37a6e44d2a34263678f7cbb /src/core/dbus-manager.c | |
| parent | 2c882b8bfa29937fb808fa1dd60c2a7ab0e8e85e (diff) | |
| parent | 417800228f69db9ff37f4193d11508757dd09308 (diff) | |
Merge pull request #1516 from poettering/dontisolaterootslice
Don't isolate `-.slice`
Diffstat (limited to 'src/core/dbus-manager.c')
| -rw-r--r-- | src/core/dbus-manager.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c index 9e21b0787d..3f4f60d6e2 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -122,8 +122,7 @@ static int property_get_tainted( void *userdata, sd_bus_error *error) { - char buf[sizeof("split-usr:mtab-not-symlink:cgroups-missing:local-hwclock:")] = "", *e = buf; - _cleanup_free_ char *p = NULL; + char buf[sizeof("split-usr:cgroups-missing:local-hwclock:")] = "", *e = buf; Manager *m = userdata; assert(bus); @@ -133,9 +132,6 @@ static int property_get_tainted( if (m->taint_usr) e = stpcpy(e, "split-usr:"); - if (readlink_malloc("/etc/mtab", &p) < 0) - e = stpcpy(e, "mtab-not-symlink:"); - if (access("/proc/cgroups", F_OK) < 0) e = stpcpy(e, "cgroups-missing:"); |