From: Lennart Poettering Date: Fri, 9 Oct 2015 15:16:12 +0000 (+0200) Subject: core: remove taint flag about /etc/mtab not being a symlink. X-Git-Tag: v228~223^2~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b492ce8a22d4527c1372b2d3fbd580627d70c917;p=thirdparty%2Fsystemd.git core: remove taint flag about /etc/mtab not being a symlink. We already stop boot if /etc/mtab is not a symlink right now, and most likely we'll stop referecing it at all in the future, either way there's no point in keeping it around as taint flag. --- diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c index 9e21b0787d2..3f4f60d6e27 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:");