SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

journalctl,loginctl,systemctl,systemd-cgls: add -l as alias for --full

Browse Source 
https://bugs.freedesktop.org/show_bug.cgi?id=65850
This commit is contained in:
Daniel Albers
2013-06-17 10:33:34 -04:00
committed by Zbigniew Jędrzejewski-Szmek
parent fa3868c6d3
commit 98a6e132b5
10 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
man/journalctl.xml
+1
View File
@@ -138,6 +138,7 @@
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>-l</option></term>
<term><option>--full</option></term> <term><option>--full</option></term>
<listitem><para>Show all (printable) fields in <listitem><para>Show all (printable) fields in
man/loginctl.xml
+1
View File
@@ -111,6 +111,7 @@
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>-l</option></term>
<term><option>--full</option></term> <term><option>--full</option></term>
<listitem><para>Do not ellipsize cgroup <listitem><para>Do not ellipsize cgroup
man/systemctl.xml
+1
View File
@@ -175,6 +175,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>-l</option></term>
<term><option>--full</option></term> <term><option>--full</option></term>
<listitem> <listitem>
man/systemd-cgls.xml
+1
View File
@@ -113,6 +113,7 @@
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>-l</option></term>
<term><option>--full</option></term> <term><option>--full</option></term>
<listitem><para>Do not ellipsize cgroup <listitem><para>Do not ellipsize cgroup
shell-completion/bash/systemctl
+1 -1
View File
@@ -70,7 +70,7 @@ _systemctl () {
local i verb comps mode local i verb comps mode
local -A OPTS=( local -A OPTS=(
[STANDALONE]='--all -a --reverse --after --before --defaults --fail --ignore-dependencies --failed --force -f --full --global [STANDALONE]='--all -a --reverse --after --before --defaults --fail --ignore-dependencies --failed --force -f --full -l --global
--help -h --no-ask-password --no-block --no-legend --no-pager --no-reload --no-wall --help -h --no-ask-password --no-block --no-legend --no-pager --no-reload --no-wall
--quiet -q --privileged -P --system --user --version --runtime' --quiet -q --privileged -P --system --user --version --runtime'
[ARG]='--host -H --kill-mode --kill-who --property -p --signal -s --type -t --root' [ARG]='--host -H --kill-mode --kill-who --property -p --signal -s --type -t --root'
shell-completion/systemd-zsh-completion.zsh
+2 -2
View File
@@ -16,7 +16,7 @@ _ctls()
'--after[Show units ordered after]' \ '--after[Show units ordered after]' \
'--before[Show units ordered before]' \ '--before[Show units ordered before]' \
'--failed[Show only failed units]' \ '--failed[Show only failed units]' \
"--full[Don't ellipsize unit names on output]" \ {-l,--full}"[Don't ellipsize unit names on output]" \
'--fail[When queueing a new job, fail if conflicting jobs are pending]' \ '--fail[When queueing a new job, fail if conflicting jobs are pending]' \
'--ignore-dependencies[When queueing a new job, ignore all its dependencies]' \ '--ignore-dependencies[When queueing a new job, ignore all its dependencies]' \
'--kill-who=[Who to send signal to]:killwho:(main control all)' \ '--kill-who=[Who to send signal to]:killwho:(main control all)' \
@@ -81,7 +81,7 @@ _ctls()
{-n,--lines=}'[Number of journal entries to show]:integer' \ {-n,--lines=}'[Number of journal entries to show]:integer' \
'--no-tail[Show all lines, even in follow mode]' \ '--no-tail[Show all lines, even in follow mode]' \
{-o,--output=}'[Change journal output mode]:output modes:_outputmodes' \ {-o,--output=}'[Change journal output mode]:output modes:_outputmodes' \
'--full[Show long fields in full]' \ {-l,--full}'[Show long fields in full]' \
{-a,--all}'[Show all fields, including long and unprintable]' \ {-a,--all}'[Show all fields, including long and unprintable]' \
{-q,--quiet}"[Don't show privilege warning]" \ {-q,--quiet}"[Don't show privilege warning]" \
'--no-pager[Do not pipe output into a pager]' \ '--no-pager[Do not pipe output into a pager]' \
src/cgls/cgls.c
+3 -4
View File
@@ -49,7 +49,7 @@ static void help(void) {
" --version Show package version\n" " --version Show package version\n"
" --no-pager Do not pipe output into a pager\n" " --no-pager Do not pipe output into a pager\n"
" -a --all Show all groups, including empty\n" " -a --all Show all groups, including empty\n"
" --full Do not ellipsize output\n" " -l --full Do not ellipsize output\n"
" -k Include kernel threads in output\n" " -k Include kernel threads in output\n"
" -M --machine Show container\n", " -M --machine Show container\n",
program_invocation_short_name); program_invocation_short_name);
@@ -60,7 +60,6 @@ static int parse_argv(int argc, char *argv[]) {
enum { enum {
ARG_NO_PAGER = 0x100, ARG_NO_PAGER = 0x100,
ARG_VERSION, ARG_VERSION,
ARG_FULL,
}; };
static const struct option options[] = { static const struct option options[] = {
@@ -68,7 +67,7 @@ static int parse_argv(int argc, char *argv[]) {
{ "version", no_argument, NULL, ARG_VERSION }, { "version", no_argument, NULL, ARG_VERSION },
{ "no-pager", no_argument, NULL, ARG_NO_PAGER }, { "no-pager", no_argument, NULL, ARG_NO_PAGER },
{ "all", no_argument, NULL, 'a' }, { "all", no_argument, NULL, 'a' },
{ "full", no_argument, NULL, ARG_FULL }, { "full", no_argument, NULL, 'l' },
{ "machine", required_argument, NULL, 'M' }, { "machine", required_argument, NULL, 'M' },
{ NULL, 0, NULL, 0 } { NULL, 0, NULL, 0 }
}; };
@@ -99,7 +98,7 @@ static int parse_argv(int argc, char *argv[]) {
arg_all = true; arg_all = true;
break; break;
case ARG_FULL: case 'l':
arg_full = true; arg_full = true;
break; break;
src/journal/journalctl.c
+4 -5
View File
@@ -125,7 +125,7 @@ static int help(void) {
" -o --output=STRING Change journal output mode (short, short-monotonic,\n" " -o --output=STRING Change journal output mode (short, short-monotonic,\n"
" verbose, export, json, json-pretty, json-sse, cat)\n" " verbose, export, json, json-pretty, json-sse, cat)\n"
" -x --catalog Add message explanations where available\n" " -x --catalog Add message explanations where available\n"
" --full Do not ellipsize fields\n" " -l --full Do not ellipsize fields\n"
" -a --all Show all fields, including long and unprintable\n" " -a --all Show all fields, including long and unprintable\n"
" -q --quiet Don't show privilege warning\n" " -q --quiet Don't show privilege warning\n"
" --no-pager Do not pipe output into a pager\n" " --no-pager Do not pipe output into a pager\n"
@@ -167,7 +167,6 @@ static int parse_argv(int argc, char *argv[]) {
ARG_SYSTEM, ARG_SYSTEM,
ARG_ROOT, ARG_ROOT,
ARG_HEADER, ARG_HEADER,
ARG_FULL,
ARG_SETUP_KEYS, ARG_SETUP_KEYS,
ARG_FILE, ARG_FILE,
ARG_INTERVAL, ARG_INTERVAL,
@@ -190,7 +189,7 @@ static int parse_argv(int argc, char *argv[]) {
{ "follow", no_argument, NULL, 'f' }, { "follow", no_argument, NULL, 'f' },
{ "output", required_argument, NULL, 'o' }, { "output", required_argument, NULL, 'o' },
{ "all", no_argument, NULL, 'a' }, { "all", no_argument, NULL, 'a' },
{ "full", no_argument, NULL, ARG_FULL }, { "full", no_argument, NULL, 'l' },
{ "lines", optional_argument, NULL, 'n' }, { "lines", optional_argument, NULL, 'n' },
{ "no-tail", no_argument, NULL, ARG_NO_TAIL }, { "no-tail", no_argument, NULL, ARG_NO_TAIL },
{ "new-id128", no_argument, NULL, ARG_NEW_ID128 }, { "new-id128", no_argument, NULL, ARG_NEW_ID128 },
@@ -229,7 +228,7 @@ static int parse_argv(int argc, char *argv[]) {
assert(argc >= 0); assert(argc >= 0);
assert(argv); assert(argv);
while ((c = getopt_long(argc, argv, "hefo:an::qmbkD:p:c:u:F:xr", options, NULL)) >= 0) { while ((c = getopt_long(argc, argv, "hefo:aln::qmbkD:p:c:u:F:xr", options, NULL)) >= 0) {
switch (c) { switch (c) {
@@ -274,7 +273,7 @@ static int parse_argv(int argc, char *argv[]) {
break; break;
case ARG_FULL: case 'l':
arg_full = true; arg_full = true;
break; break;
src/login/loginctl.c
+3 -4
View File
@@ -1297,7 +1297,7 @@ static int help(void) {
" -p --property=NAME Show only properties by this name\n" " -p --property=NAME Show only properties by this name\n"
" -a --all Show all properties, including empty ones\n" " -a --all Show all properties, including empty ones\n"
" --kill-who=WHO Who to send signal to\n" " --kill-who=WHO Who to send signal to\n"
" --full Do not ellipsize output\n" " -l --full Do not ellipsize output\n"
" -s --signal=SIGNAL Which signal to send\n" " -s --signal=SIGNAL Which signal to send\n"
" --no-ask-password Don't prompt for password\n" " --no-ask-password Don't prompt for password\n"
" -H --host=[USER@]HOST Show information for remote host\n" " -H --host=[USER@]HOST Show information for remote host\n"
@@ -1339,7 +1339,6 @@ static int parse_argv(int argc, char *argv[]) {
ARG_NO_PAGER, ARG_NO_PAGER,
ARG_KILL_WHO, ARG_KILL_WHO,
ARG_NO_ASK_PASSWORD, ARG_NO_ASK_PASSWORD,
ARG_FULL,
}; };
static const struct option options[] = { static const struct option options[] = {
@@ -1353,7 +1352,7 @@ static int parse_argv(int argc, char *argv[]) {
{ "host", required_argument, NULL, 'H' }, { "host", required_argument, NULL, 'H' },
{ "privileged", no_argument, NULL, 'P' }, { "privileged", no_argument, NULL, 'P' },
{ "no-ask-password", no_argument, NULL, ARG_NO_ASK_PASSWORD }, { "no-ask-password", no_argument, NULL, ARG_NO_ASK_PASSWORD },
{ "full", no_argument, NULL, ARG_FULL }, { "full", no_argument, NULL, 'l' },
{ NULL, 0, NULL, 0 } { NULL, 0, NULL, 0 }
}; };
@@ -1425,7 +1424,7 @@ static int parse_argv(int argc, char *argv[]) {
parse_user_at_host(optarg, &arg_user, &arg_host); parse_user_at_host(optarg, &arg_user, &arg_host);
break; break;
case ARG_FULL: case 'l':
arg_full = true; arg_full = true;
break; break;
src/systemctl/systemctl.c
+3 -4
View File
@@ -4599,7 +4599,7 @@ static int systemctl_help(void) {
" the 'list-unit-files' command instead.\n" " the 'list-unit-files' command instead.\n"
" --reverse Show reverse dependencies with 'list-dependencies'\n" " --reverse Show reverse dependencies with 'list-dependencies'\n"
" --failed Show only failed units\n" " --failed Show only failed units\n"
" --full Don't ellipsize unit names on output\n" " -l --full Don't ellipsize unit names on output\n"
" --fail When queueing a new job, fail if conflicting jobs are\n" " --fail When queueing a new job, fail if conflicting jobs are\n"
" pending\n" " pending\n"
" --irreversible Create jobs which cannot be implicitly cancelled\n" " --irreversible Create jobs which cannot be implicitly cancelled\n"
@@ -4819,7 +4819,6 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
ARG_NO_PAGER, ARG_NO_PAGER,
ARG_NO_WALL, ARG_NO_WALL,
ARG_ROOT, ARG_ROOT,
ARG_FULL,
ARG_NO_RELOAD, ARG_NO_RELOAD,
ARG_KILL_WHO, ARG_KILL_WHO,
ARG_NO_ASK_PASSWORD, ARG_NO_ASK_PASSWORD,
@@ -4840,7 +4839,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
{ "before", no_argument, NULL, ARG_BEFORE }, { "before", no_argument, NULL, ARG_BEFORE },
{ "show-types", no_argument, NULL, ARG_SHOW_TYPES }, { "show-types", no_argument, NULL, ARG_SHOW_TYPES },
{ "failed", no_argument, NULL, ARG_FAILED }, { "failed", no_argument, NULL, ARG_FAILED },
{ "full", no_argument, NULL, ARG_FULL }, { "full", no_argument, NULL, 'l' },
{ "fail", no_argument, NULL, ARG_FAIL }, { "fail", no_argument, NULL, ARG_FAIL },
{ "irreversible", no_argument, NULL, ARG_IRREVERSIBLE }, { "irreversible", no_argument, NULL, ARG_IRREVERSIBLE },
{ "ignore-dependencies", no_argument, NULL, ARG_IGNORE_DEPENDENCIES }, { "ignore-dependencies", no_argument, NULL, ARG_IGNORE_DEPENDENCIES },
@@ -5021,7 +5020,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
arg_root = optarg; arg_root = optarg;
break; break;
case ARG_FULL: case 'l':
arg_full = true; arg_full = true;
break; break;