]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
core: remove taint flag about /etc/mtab not being a symlink.
authorLennart Poettering <lennart@poettering.net>
Fri, 9 Oct 2015 15:16:12 +0000 (17:16 +0200)
committerLennart Poettering <lennart@poettering.net>
Fri, 9 Oct 2015 15:20:32 +0000 (17:20 +0200)
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.

src/core/dbus-manager.c

index 9e21b0787d25ea4b74ed0d1107eb6935969ca568..3f4f60d6e27ace07b1a79bd038892c1fc591137e 100644 (file)
@@ -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:");