hwclock: add taint flag for non-local hwclock

diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index 770fce12099e7a7808801553a629892da26a2bd0..6655f2940ca8b82ebae0871a35f9c38256455c04 100644 (file)
--- 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)
         assert(m);
 
         if (m->taint_usr)

-                e = stpcpy(e, "usr-separate-fs ");
+                e = stpcpy(e, "split-usr:");

 
         if (readlink_malloc("/etc/mtab", &p) < 0)
 
         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)
         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;
 
         if (!dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &t))
                 return -ENOMEM;

diff --git a/src/shared/util.c b/src/shared/util.c
index ba2456283962574753eaa1670c6f3373bfe1ee46..fd2c5b075f77649f943ccf4cb59d02a3fc673e9d 100644 (file)
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -5001,7 +5001,6 @@ int hwclock_is_localtime(void) {
                 if (!b)
                         return -EIO;
 
                 if (!b)
                         return -EIO;
 

-

                 truncate_nl(line);
                 local = streq(line, "LOCAL");
 
                 truncate_nl(line);
                 local = streq(line, "LOCAL");
 


@@ -5136,7 +5135,7 @@ int hwclock_get_time(struct tm *tm) {
         if (ioctl(fd, RTC_RD_TIME, tm) < 0)
                 err = -errno;
 
         if (ioctl(fd, RTC_RD_TIME, tm) < 0)
                 err = -errno;
 

-        /* We don't now daylight saving, so we reset this in order not
+        /* We don't know daylight saving, so we reset this in order not

          * to confused mktime(). */
         tm->tm_isdst = -1;
 
          * to confused mktime(). */
         tm->tm_isdst = -1;