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