ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/annajonna/util-linux

This commit is contained in:
Karel Zak 2016-02-01 13:39:48 +01:00
parent 9aa3173bab dadaad0187
commit 6fc24cc211
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys-utils/hwclock.8.in
View File

@ -94,6 +94,10 @@ in UTC. See the
.B \%\-\-localtime
option.
.sp
The time shown is in same format as that of
.BR \%date (1)
by default, and additionally, the number of microseconds is shown.
.sp
Showing the Hardware Clock time is the default when no function is specified.
.sp
The
@ -298,7 +302,7 @@ The value of this option is used as an argument to the
option. For example:
.RS
.IP "" 4
.B "hwclock\ \-\-set\ \-\-date='2011-08-14\ 16:45:05'
.B "hwclock\ \-\-set\ \-\-date='2011-08-14\ 16:45:05'"
.PP
The argument must be in local time, even if you keep your Hardware Clock in
UTC. See the

2
sys-utils/hwclock.c
View File

@ -693,7 +693,7 @@ display_time(const bool hclock_valid, struct timeval hwctime)
lt = localtime(&hwctime.tv_sec);
strftime(ctime_now, sizeof(ctime_now), format, lt);
printf(_("%s .%06d seconds\n"), ctime_now, (int)hwctime.tv_usec);
printf(_("%s and %06d microseconds\n"), ctime_now, (int)hwctime.tv_usec);
}
}