aboutsummaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/hwclock.c11
-rw-r--r--util-linux/rtcwake.c18
2 files changed, 11 insertions, 18 deletions
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index e85bca2b2..791525fc2 100644
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -296,16 +296,15 @@ static void set_system_clock_timezone(int utc)
//usage:#define hwclock_trivial_usage
//usage: IF_LONG_OPTS(
-//usage: "[-r|--show] [-s|--hctosys] [-w|--systohc] [--systz]"
-//usage: " [--localtime] [-u|--utc]"
-//usage: " [-f|--rtc FILE]"
+//usage: "[-swu] [--systz] [--localtime] [-f FILE]"
//usage: )
//usage: IF_NOT_LONG_OPTS(
-//usage: "[-r] [-s] [-w] [-t] [-l] [-u] [-f FILE]"
+//usage: "[-swtlu] [-f FILE]"
//usage: )
//usage:#define hwclock_full_usage "\n\n"
-//usage: "Query and set hardware clock (RTC)\n"
-//usage: "\n -r Show hardware clock time"
+//usage: "Show or set hardware clock (RTC)\n"
+///////: "\n -r Show hardware clock time"
+///////-r is default, don't bother showing it in help
//usage: "\n -s Set system time from hardware clock"
//usage: "\n -w Set hardware clock from system time"
//usage: IF_LONG_OPTS(
diff --git a/util-linux/rtcwake.c b/util-linux/rtcwake.c
index 823e55662..be7e95099 100644
--- a/util-linux/rtcwake.c
+++ b/util-linux/rtcwake.c
@@ -32,28 +32,22 @@
//kbuild:lib-$(CONFIG_RTCWAKE) += rtcwake.o
+//usage:#if ENABLE_FEATURE_HWCLOCK_ADJTIME_FHS
+//usage:# define ADJTIME_PATH "/var/lib/hwclock/adjtime"
+//usage:#else
+//usage:# define ADJTIME_PATH "/etc/adjtime"
+//usage:#endif
//usage:#define rtcwake_trivial_usage
//usage: "[-a | -l | -u] [-d DEV] [-m MODE] [-s SEC | -t TIME]"
//usage:#define rtcwake_full_usage "\n\n"
//usage: "Enter a system sleep state until specified wakeup time\n"
-//usage: IF_LONG_OPTS(
-//usage: "\n -a,--auto Read clock mode from adjtime"
-//usage: "\n -l,--local Clock is set to local time"
-//usage: "\n -u,--utc Clock is set to UTC time"
-//usage: "\n -d,--device DEV Specify the RTC device"
-//usage: "\n -m,--mode MODE Set sleep state (default: standby)"
-//usage: "\n -s,--seconds SEC Set timeout in SEC seconds from now"
-//usage: "\n -t,--time TIME Set timeout to TIME seconds from epoch"
-//usage: )
-//usage: IF_NOT_LONG_OPTS(
-//usage: "\n -a Read clock mode from adjtime"
+//usage: "\n -a Read clock mode from "ADJTIME_PATH" (default)"
//usage: "\n -l Clock is set to local time"
//usage: "\n -u Clock is set to UTC time"
//usage: "\n -d DEV Specify the RTC device"
//usage: "\n -m MODE Set sleep state (default: standby)"
//usage: "\n -s SEC Set timeout in SEC seconds from now"
//usage: "\n -t TIME Set timeout to TIME seconds from epoch"
-//usage: )
#include "libbb.h"
#include "rtc_.h"