richardphibel / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
594167
From 17dfcbd7fe332e7559e168520a57b0241d688485 Mon Sep 17 00:00:00 2001
594167
From: Frantisek Sumsal <frantisek@sumsal.cz>
594167
Date: Mon, 21 Feb 2022 13:14:18 +0100
594167
Subject: [PATCH] systemctl,man: update docs for `--timestamp=`
594167
594167
(cherry picked from commit b58b4a9f379748fec667fb60606de945eaafadbe)
594167
594167
Related: #2017035
594167
---
594167
 man/systemctl.xml         | 7 +++++++
594167
 src/systemctl/systemctl.c | 7 ++-----
594167
 2 files changed, 9 insertions(+), 5 deletions(-)
594167
594167
diff --git a/man/systemctl.xml b/man/systemctl.xml
594167
index 3b3d709ab3..f28579e05d 100644
594167
--- a/man/systemctl.xml
594167
+++ b/man/systemctl.xml
594167
@@ -2305,6 +2305,13 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err
594167
             </varlistentry>
594167
           </variablelist>
594167
 
594167
+          <variablelist>
594167
+            <varlistentry>
594167
+              <term><option>unix</option></term>
594167
+              <listitem><para><literal>@seconds-since-the-epoch</literal></para></listitem>
594167
+            </varlistentry>
594167
+          </variablelist>
594167
+
594167
           <variablelist>
594167
             <varlistentry>
594167
               <term><option>us</option></term>
594167
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
594167
index 9031e685ea..0489796a75 100644
594167
--- a/src/systemctl/systemctl.c
594167
+++ b/src/systemctl/systemctl.c
594167
@@ -296,11 +296,8 @@ static int systemctl_help(void) {
594167
                "     --boot-loader-entry=NAME\n"
594167
                "                         Boot into a specific boot loader entry on next boot\n"
594167
                "     --plain             Print unit dependencies as a list instead of a tree\n"
594167
-               "     --timestamp=FORMAT  Change format of printed timestamps.\n"
594167
-               "                         'pretty' (default): 'Day YYYY-MM-DD HH:MM:SS TZ\n"
594167
-               "                         'us': 'Day YYYY-MM-DD HH:MM:SS.UUUUUU TZ\n"
594167
-               "                         'utc': 'Day YYYY-MM-DD HH:MM:SS UTC\n"
594167
-               "                         'us+utc': 'Day YYYY-MM-DD HH:MM:SS.UUUUUU UTC\n"
594167
+               "     --timestamp=FORMAT  Change format of printed timestamps (pretty, unix,\n"
594167
+               "                             us, utc, us+utc)\n"
594167
                "     --read-only         Create read-only bind mount\n"
594167
                "     --mkdir             Create directory before mounting, if missing\n"
594167
                "     --marked            Restart/reload previously marked units\n"