summaryrefslogtreecommitdiff
path: root/src/core/dbus-manager.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-05-03 15:46:04 +0200
committerLennart Poettering <lennart@poettering.net>2012-05-03 16:00:49 +0200
commite677bf7ef610acdc5068b9d5d4c79556a236e52f (patch)
tree59986ef2ac76a1f37fb75feb8a20c609c4f9b822 /src/core/dbus-manager.c
parent741f8cf6b986ef21bbdf88d538a1d40449ef21ae (diff)
hwclock: add taint flag for non-local hwclock
Diffstat (limited to 'src/core/dbus-manager.c')
-rw-r--r--src/core/dbus-manager.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index 770fce1209..6655f2940c 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -294,17 +294,23 @@ static int bus_manager_append_tainted(DBusMessageIter *i, const char *property,
assert(m);
if (m->taint_usr)
- e = stpcpy(e, "usr-separate-fs ");
+ e = stpcpy(e, "split-usr:");
if (readlink_malloc("/etc/mtab", &p) < 0)
- e = stpcpy(e, "etc-mtab-not-symlink ");
+ e = stpcpy(e, "mtab-not-symlink:");
else
free(p);
if (access("/proc/cgroups", F_OK) < 0)
- stpcpy(e, "cgroups-missing ");
+ stpcpy(e, "cgroups-missing:");
- t = strstrip(buf);
+ if (hwclock_is_localtime() > 0)
+ stpcpy(e, "local-hwclock:");
+
+ if (endswith(buf, ":"))
+ buf[strlen(buf)-1] = 0;
+
+ t = buf;
if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &t))
return -ENOMEM;