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

Merge pull request #18596 from keszybz/systemctl-quiet-legend

Browse Source 
systemctl: hide legends with --quiet, allow overriding
This commit is contained in:
Lennart Poettering
2021-02-17 23:40:04 +01:00
committed by GitHub
parent a63b54eda5 d60bd2ffb7
commit dc288ffeab
25 changed files with 202 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resolve/resolvectl.c
+33 -36
View File
@@ -23,6 +23,7 @@
#include "missing_network.h"
#include "netlink-util.h"
#include "pager.h"
#include "parse-argument.h"
#include "parse-util.h"
#include "pretty-print.h"
#include "resolvconf-compat.h"
@@ -2811,11 +2812,9 @@ static int compat_parse_argv(int argc, char *argv[]) {
break;
case ARG_LEGEND:
r = parse_boolean(optarg);
r = parse_boolean_argument("--legend=", optarg, &arg_legend);
if (r < 0)
return log_error_errno(r, "Failed to parse --legend= argument");
arg_legend = r;
return r;
break;
case 'p':
@@ -2877,30 +2876,30 @@ static int compat_parse_argv(int argc, char *argv[]) {
break;
case ARG_CNAME:
r = parse_boolean(optarg);
r = parse_boolean_argument("--cname=", optarg, NULL);
if (r < 0)
return log_error_errno(r, "Failed to parse --cname= argument.");
return r;
SET_FLAG(arg_flags, SD_RESOLVED_NO_CNAME, r == 0);
break;
case ARG_SERVICE_ADDRESS:
r = parse_boolean(optarg);
r = parse_boolean_argument("--service-address=", optarg, NULL);
if (r < 0)
return log_error_errno(r, "Failed to parse --service-address= argument.");
return r;
SET_FLAG(arg_flags, SD_RESOLVED_NO_ADDRESS, r == 0);
break;
case ARG_SERVICE_TXT:
r = parse_boolean(optarg);
r = parse_boolean_argument("--service-txt=", optarg, NULL);
if (r < 0)
return log_error_errno(r, "Failed to parse --service-txt= argument.");
return r;
SET_FLAG(arg_flags, SD_RESOLVED_NO_TXT, r == 0);
break;
case ARG_SEARCH:
r = parse_boolean(optarg);
r = parse_boolean_argument("--search=", optarg, NULL);
if (r < 0)
return log_error_errno(r, "Failed to parse --search argument.");
return r;
SET_FLAG(arg_flags, SD_RESOLVED_NO_SEARCH, r == 0);
break;
@@ -3107,11 +3106,9 @@ static int native_parse_argv(int argc, char *argv[]) {
break;
case ARG_LEGEND:
r = parse_boolean(optarg);
r = parse_boolean_argument("--legend=", optarg, &arg_legend);
if (r < 0)
return log_error_errno(r, "Failed to parse --legend= argument");
arg_legend = r;
return r;
break;
case 'p':
@@ -3157,72 +3154,72 @@ static int native_parse_argv(int argc, char *argv[]) {
break;
case ARG_CNAME:
r = parse_boolean(optarg);
r = parse_boolean_argument("--cname=", optarg, NULL);
if (r < 0)
return log_error_errno(r, "Failed to parse --cname= argument.");
return r;
SET_FLAG(arg_flags, SD_RESOLVED_NO_CNAME, r == 0);
break;
case ARG_VALIDATE:
r = parse_boolean(optarg);
r = parse_boolean_argument("--validate=", optarg, NULL);
if (r < 0)
return log_error_errno(r, "Failed to parse --validate= argument.");
return r;
SET_FLAG(arg_flags, SD_RESOLVED_NO_VALIDATE, r == 0);
break;
case ARG_SYNTHESIZE:
r = parse_boolean(optarg);
r = parse_boolean_argument("--synthesize=", optarg, NULL);
if (r < 0)
return log_error_errno(r, "Failed to parse --synthesize= argument.");
return r;
SET_FLAG(arg_flags, SD_RESOLVED_NO_SYNTHESIZE, r == 0);
break;
case ARG_CACHE:
r = parse_boolean(optarg);
r = parse_boolean_argument("--cache=", optarg, NULL);
if (r < 0)
return log_error_errno(r, "Failed to parse --cache= argument.");
return r;
SET_FLAG(arg_flags, SD_RESOLVED_NO_CACHE, r == 0);
break;
case ARG_ZONE:
r = parse_boolean(optarg);
r = parse_boolean_argument("--zone=", optarg, NULL);
if (r < 0)
return log_error_errno(r, "Failed to parse --zone= argument.");
return r;
SET_FLAG(arg_flags, SD_RESOLVED_NO_ZONE, r == 0);
break;
case ARG_TRUST_ANCHOR:
r = parse_boolean(optarg);
r = parse_boolean_argument("--trust-anchor=", optarg, NULL);
if (r < 0)
return log_error_errno(r, "Failed to parse --trust-anchor= argument.");
return r;
SET_FLAG(arg_flags, SD_RESOLVED_NO_TRUST_ANCHOR, r == 0);
break;
case ARG_NETWORK:
r = parse_boolean(optarg);
r = parse_boolean_argument("--network=", optarg, NULL);
if (r < 0)
return log_error_errno(r, "Failed to parse --network= argument.");
return r;
SET_FLAG(arg_flags, SD_RESOLVED_NO_NETWORK, r == 0);
break;
case ARG_SERVICE_ADDRESS:
r = parse_boolean(optarg);
r = parse_boolean_argument("--service-address=", optarg, NULL);
if (r < 0)
return log_error_errno(r, "Failed to parse --service-address= argument.");
return r;
SET_FLAG(arg_flags, SD_RESOLVED_NO_ADDRESS, r == 0);
break;
case ARG_SERVICE_TXT:
r = parse_boolean(optarg);
r = parse_boolean_argument("--service-txt=", optarg, NULL);
if (r < 0)
return log_error_errno(r, "Failed to parse --service-txt= argument.");
return r;
SET_FLAG(arg_flags, SD_RESOLVED_NO_TXT, r == 0);
break;
case ARG_SEARCH:
r = parse_boolean(optarg);
r = parse_boolean_argument("--search=", optarg, NULL);
if (r < 0)
return log_error_errno(r, "Failed to parse --search argument.");
return r;
SET_FLAG(arg_flags, SD_RESOLVED_NO_SEARCH, r == 0);
break;