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