diff options
| author | Kay Sievers <kay@vrfy.org> | 2014-05-22 21:21:38 +0900 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2014-05-24 07:56:20 +0900 |
| commit | 24efb112451413c1013d5f7fe27d7e2cd407647a (patch) | |
| tree | a760e567b968e63e91de5725395b10e48de46b49 /src/core | |
| parent | 68baa8faf30f4e097bcf32d5b2d4880f85a0bdc7 (diff) | |
shared: rename hwclock.[ch] to clock-util.[ch]
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/dbus-manager.c | 4 | ||||
| -rw-r--r-- | src/core/main.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c index d5fab0a22c..333c1d46e7 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -28,7 +28,7 @@ #include "install.h" #include "selinux-access.h" #include "watchdog.h" -#include "hwclock.h" +#include "clock-util.h" #include "path-util.h" #include "virt.h" #include "architecture.h" @@ -130,7 +130,7 @@ static int property_get_tainted( if (access("/proc/cgroups", F_OK) < 0) e = stpcpy(e, "cgroups-missing:"); - if (hwclock_is_localtime() > 0) + if (clock_is_localtime() > 0) e = stpcpy(e, "local-hwclock:"); /* remove the last ':' */ diff --git a/src/core/main.c b/src/core/main.c index 74c50f51be..77cc2fbbdd 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -61,7 +61,7 @@ #include "capability.h" #include "killall.h" #include "env-util.h" -#include "hwclock.h" +#include "clock-util.h" #include "fileio.h" #include "dbus-manager.h" #include "bus-error.h" @@ -1352,11 +1352,11 @@ int main(int argc, char *argv[]) { goto finish; if (!skip_setup) { - if (hwclock_is_localtime() > 0) { + if (clock_is_localtime() > 0) { int min; /* The first-time call to settimeofday() does a time warp in the kernel */ - r = hwclock_set_timezone(&min); + r = clock_set_timezone(&min); if (r < 0) log_error("Failed to apply local time delta, ignoring: %s", strerror(-r)); else @@ -1370,10 +1370,10 @@ int main(int argc, char *argv[]) { * that way. In such case, we need to delay the time-warp or the sealing * until we reach the real system. */ - hwclock_reset_timezone(); + clock_reset_timezone(); /* Tell the kernel our timezone */ - r = hwclock_set_timezone(NULL); + r = clock_set_timezone(NULL); if (r < 0) log_error("Failed to set the kernel's timezone, ignoring: %s", strerror(-r)); } |