diff options
| author | Lennart Poettering <lennart@poettering.net> | 2021-02-17 23:40:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-17 23:40:04 +0100 |
| commit | dc288ffeabebd72a686dbd530e2aa169472f7fe4 (patch) | |
| tree | 679d9dcd235e0e19408deb2be99b195dea618212 /src/busctl | |
| parent | a63b54eda5cb7997b26f574147e0106f9ce458d9 (diff) | |
| parent | d60bd2ffb7ac3122fd56048518b1f4a70aa4fe93 (diff) | |
| download | systemd-dc288ffeabebd72a686dbd530e2aa169472f7fe4.tar.gz | |
Merge pull request #18596 from keszybz/systemctl-quiet-legend
systemctl: hide legends with --quiet, allow overriding
Diffstat (limited to 'src/busctl')
| -rw-r--r-- | src/busctl/busctl.c | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c index fde9240749..71a6d7e050 100644 --- a/src/busctl/busctl.c +++ b/src/busctl/busctl.c @@ -2471,27 +2471,22 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_EXPECT_REPLY: - r = parse_boolean(optarg); + r = parse_boolean_argument("--expect-reply=", optarg, &arg_expect_reply); if (r < 0) - return log_error_errno(r, "Failed to parse --expect-reply= parameter '%s': %m", optarg); - - arg_expect_reply = r; + return r; break; case ARG_AUTO_START: - r = parse_boolean(optarg); + r = parse_boolean_argument("--auto-start=", optarg, &arg_auto_start); if (r < 0) - return log_error_errno(r, "Failed to parse --auto-start= parameter '%s': %m", optarg); - - arg_auto_start = r; + return r; break; case ARG_ALLOW_INTERACTIVE_AUTHORIZATION: - r = parse_boolean(optarg); + r = parse_boolean_argument("--allow-interactive-authorization=", optarg, + &arg_allow_interactive_authorization); if (r < 0) - return log_error_errno(r, "Failed to parse --allow-interactive-authorization= parameter '%s': %m", optarg); - - arg_allow_interactive_authorization = r; + return r; break; case ARG_TIMEOUT: @@ -2502,19 +2497,15 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_AUGMENT_CREDS: - r = parse_boolean(optarg); + r = parse_boolean_argument("--augment-creds=", optarg, &arg_augment_creds); if (r < 0) - return log_error_errno(r, "Failed to parse --augment-creds= parameter '%s': %m", optarg); - - arg_augment_creds = r; + return r; break; case ARG_WATCH_BIND: - r = parse_boolean(optarg); + r = parse_boolean_argument("--watch-bind=", optarg, &arg_watch_bind); if (r < 0) - return log_error_errno(r, "Failed to parse --watch-bind= parameter '%s': %m", optarg); - - arg_watch_bind = r; + return r; break; case 'j': |