Merge pull request #844 from poettering/clock-boottime2

tree-wide: convert bootchart and lldp code to use clock_boottime_or_m…

src/bootchart/bootchart.c

@@ -367,7 +367,7 @@ int main(int argc, char *argv[]) {
                 struct timespec n;
                 double uptime;
 
-                clock_gettime(CLOCK_BOOTTIME, &n);
+                clock_gettime(clock_boottime_or_monotonic(), &n);
                 uptime = (n.tv_sec + (n.tv_nsec / (double) NSEC_PER_SEC));
 
                 log_start = gettime_ns();

src/libsystemd-network/sd-lldp.c

@@ -392,7 +392,7 @@ static void lldp_mib_delete_objects(sd_lldp *lldp) {
                         break;
 
                 if (t <= 0)
-                        t = now(CLOCK_BOOTTIME);
+                        t = now(clock_boottime_or_monotonic());
 
                 if (p->until > t)
                         break;
@@ -490,7 +490,7 @@ int sd_lldp_save(sd_lldp *lldp, const char *lldp_file) {
                         free(s);
                         s = k;
 
-                        time = now(CLOCK_BOOTTIME);
+                        time = now(clock_boottime_or_monotonic());
 
                         /* Don't write expired packets */
                         if (time - p->until <= 0)

src/network/networkctl.c

@@ -976,7 +976,7 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) {
                                                 return log_warning_errno(r < 0 ? r : ERANGE,
                                                                          "Failed to parse TTL \"%s\": %m", b);
 
-                                        time = now(CLOCK_BOOTTIME);
+                                        time = now(clock_boottime_or_monotonic());
                                         if (x < time)
                                                 continue;