You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
36 lines
2.0 KiB
36 lines
2.0 KiB
7 years ago
|
From 205750e2144e942bb6c04bb901684cc1aea82a26 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Vedran=20Mileti=C4=87?= <rivanvx@gmail.com>
|
||
|
|
Date: Thu, 2 Jul 2015 00:13:31 +0200
|
||
|
|
Subject: [PATCH] timedatectl: trim non-local RTC warning to 80 chars wide
|
||
|
|
|
||
|
|
(cherry picked from commit ab59f4123a6f9c32953e522cc9afc5fc610d59ca)
|
||
|
|
|
||
|
|
Cherry-picked from: ab59f41
|
||
|
|
Resolves: #1222517
|
||
|
|
---
|
||
|
|
src/timedate/timedatectl.c | 11 ++++++-----
|
||
|
|
1 file changed, 6 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
|
||
|
|
index 4d8988673..1accccb68 100644
|
||
|
|
--- a/src/timedate/timedatectl.c
|
||
|
|
+++ b/src/timedate/timedatectl.c
|
||
|
|
@@ -190,11 +190,12 @@ static void print_status_info(const StatusInfo *i) {
|
||
|
|
|
||
|
|
if (i->rtc_local)
|
||
|
|
fputs("\n" ANSI_HIGHLIGHT_ON
|
||
|
|
- "Warning: The system is configured to read the RTC time in the local time zone. This\n"
|
||
|
|
- " mode can not be fully supported. It will create various problems with time\n"
|
||
|
|
- " zone changes and daylight saving time adjustments. The RTC time is never updated,\n"
|
||
|
|
- " it relies on external facilities to maintain it. If at all possible, use\n"
|
||
|
|
- " RTC in UTC by calling 'timedatectl set-local-rtc 0'" ANSI_HIGHLIGHT_OFF ".\n", stdout);
|
||
|
|
+ "Warning: The system is configured to read the RTC time in the local time zone.\n"
|
||
|
|
+ " This mode can not be fully supported. It will create various problems\n"
|
||
|
|
+ " with time zone changes and daylight saving time adjustments. The RTC\n"
|
||
|
|
+ " time is never updated, it relies on external facilities to maintain it.\n"
|
||
|
|
+ " If at all possible, use RTC in UTC by calling\n"
|
||
|
|
+ " 'timedatectl set-local-rtc 0'" ANSI_HIGHLIGHT_OFF ".\n", stdout);
|
||
|
|
}
|
||
|
|
|
||
|
|
static int show_status(sd_bus *bus, char **args, unsigned n) {
|