SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shared: rename hwclock.[ch] to clock-util.[ch]

Browse Source
This commit is contained in:
Kay Sievers
2014-05-24 07:56:20 +09:00
parent 68baa8faf3
commit 24efb11245
7 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/dbus-manager.c
+2 -2
View File
@@ -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 ':' */
src/core/main.c
+5 -5
View File
@@ -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));
}