Another batch of conversions to COMMAND structures and additions of --introspect-cli (#43503)

This time, various commands with non-trivial requirements are handled.
So the series is shorter, but has a pattern of feature additions and
then those new features being used. The way that --help output is
formatted is changed a bit in various places. Those changes are
described in individual commits.

22 'static int help()' functions left after this.

src/ac-power/ac-power.c

@@ -32,7 +32,7 @@ static int parse_argv(int argc, char *argv[]) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-ac-power");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/analyze/analyze.c

@@ -203,7 +203,7 @@ COMMAND(
         .pager_flags = &arg_pager_flags,
 );
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-analyze");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 /* When updating this list, including descriptions, apply changes to
  * shell-completion/bash/systemd-analyze and shell-completion/zsh/_systemd-analyze too. */
@@ -336,7 +336,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                         break;
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-analyze");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/ask-password/ask-password.c

@@ -55,7 +55,7 @@ static int parse_argv(int argc, char *argv[]) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-ask-password");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/backlight/backlight.c

@@ -625,7 +625,7 @@ static int verb_save(int argc, char *argv[], uintptr_t _data, void *userdata) {
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-backlight");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -638,7 +638,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-backlight");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/battery-check/battery-check.c

@@ -66,7 +66,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-battery-check");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/binfmt/binfmt.c

@@ -126,7 +126,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-binfmt");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/bless-boot/bless-boot.c

@@ -39,7 +39,7 @@ typedef enum Status {
         STATUS_INDETERMINATE,
 } Status;
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-bless-boot");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int check_support(void) {
         if (detect_container() > 0)
@@ -65,7 +65,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-bless-boot");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/bless-boot/boot-check-no-failures.c

@@ -25,7 +25,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-boot-check-no-failures");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/bootctl/bootctl.c

@@ -295,7 +295,7 @@ GracefulMode arg_graceful(void) {
         return _arg_graceful;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("bootctl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 VERB_GROUP("Generic EFI Firmware/Boot Loader Commands");
 
@@ -413,7 +413,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 OPTION_GROUP("Options"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("bootctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/busctl/busctl.c

@@ -2081,7 +2081,7 @@ static int verb_set_property(int argc, char *argv[], uintptr_t _data, void *user
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO("busctl");
+VERB_COMMON_HELP_AUTO();
 
 static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         assert(argc >= 0);
@@ -2095,7 +2095,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("busctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/cgls/cgls.c

@@ -56,7 +56,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-cgls");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/cgtop/cgtop.c

@@ -703,7 +703,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-cgtop");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/clonesetup/clonesetup.c

@@ -150,7 +150,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-clonesetup");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/coredump/coredumpctl.c

@@ -183,7 +183,7 @@ static int acquire_journal(sd_journal **ret, char **matches) {
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("coredumpctl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         int r;
@@ -198,7 +198,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("coredumpctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/creds/creds.c

@@ -779,7 +779,7 @@ static int verb_has_tpm2(int argc, char *argv[], uintptr_t _data, void *userdata
         return verb_has_tpm2_generic(arg_quiet);
 }
 
-VERB_COMMON_HELP_AUTO("systemd-creds");
+VERB_COMMON_HELP_AUTO();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -792,7 +792,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-creds");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/cryptenroll/cryptenroll.c

@@ -365,7 +365,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-cryptenroll");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/cryptsetup/cryptsetup.c

@@ -2379,7 +2379,7 @@ static int attach_luks_or_plain_or_bitlk(
         return attach_luks_or_plain_or_bitlk_by_passphrase(cd, name, passwords, flags, pass_volume_key);
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-cryptsetup");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -2392,7 +2392,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-cryptsetup");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/delta/delta.c

@@ -513,7 +513,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-delta");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/detect-virt/detect-virt.c

@@ -36,7 +36,7 @@ static int parse_argv(int argc, char *argv[]) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-detect-virt");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/dissect/dissect.c

@@ -404,7 +404,7 @@ static int parse_argv(int argc, char *argv[]) {
                 OPTION_GROUP("Commands"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-dissect");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/escape/escape-tool.c

@@ -44,7 +44,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-escape");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/factory-reset/factory-reset-tool.c

@@ -39,7 +39,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-factory-reset");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/firstboot/firstboot.c

@@ -1394,7 +1394,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-firstboot");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/growfs/growfs.c

@@ -145,7 +145,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-growfs");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/hibernate-resume/hibernate-resume.c

@@ -42,7 +42,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-hibernate-resume");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/home/homectl.c

@@ -4043,7 +4043,7 @@ static int parse_fido2_device_field(const char *arg) {
         return 1;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("homectl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         _cleanup_strv_free_ char **arg_languages = NULL;
@@ -4072,7 +4072,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("homectl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/hostname/hostnamectl.c

@@ -853,7 +853,7 @@ static int verb_get_or_set_tags(int argc, char *argv[], uintptr_t _data, void *u
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("hostnamectl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         int r;
@@ -866,7 +866,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("hostnamectl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/hwdb/hwdb.c

@@ -35,7 +35,7 @@ static int verb_update(int argc, char *argv[], uintptr_t _data, void *userdata)
         return hwdb_update(arg_root, arg_hwdb_bin_dir, arg_strict, false);
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-hwdb");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -48,7 +48,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-hwdb");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/id128/id128.c

@@ -234,7 +234,7 @@ static int verb_show(int argc, char *argv[], uintptr_t _data, void *userdata) {
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO("systemd-id128");
+VERB_COMMON_HELP_AUTO();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         int r;
@@ -247,7 +247,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-id128");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/imds/imds-tool.c

@@ -70,7 +70,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-imds");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/imds/imdsd.c

@@ -2213,7 +2213,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-imdsd");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/import/export.c

@@ -197,7 +197,7 @@ static int verb_export_raw(int argc, char *argv[], uintptr_t _data, void *userda
         return -r;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-export");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -210,7 +210,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-export");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/import/import-fs.c

@@ -272,7 +272,7 @@ static int verb_import_fs(int argc, char *argv[], uintptr_t _data, void *userdat
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-import-fs");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -286,7 +286,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-import-fs");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/import/import.c

@@ -275,7 +275,7 @@ static int verb_raw(int argc, char *argv[], uintptr_t _data, void *userdata) {
         return -r;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-import");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         int r;
@@ -289,7 +289,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-import");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/import/importctl.c

@@ -1066,7 +1066,7 @@ static int verb_list_images(int argc, char *argv[], uintptr_t _data, void *userd
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO("importctl");
+VERB_COMMON_HELP_AUTO();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         int r;
@@ -1080,7 +1080,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("importctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/import/pull.c

@@ -320,7 +320,7 @@ static int verb_oci(int argc, char *argv[], uintptr_t _data, void *userdata) {
         return -r;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-pull");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         int r;
@@ -335,7 +335,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-pull");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/journal-remote/journal-gatewayd.c

@@ -1112,7 +1112,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-journal-gatewayd");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/journal-remote/journal-remote-main.c

@@ -889,7 +889,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-journal-remote");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/journal-remote/journal-upload.c

@@ -703,7 +703,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-journal-upload");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/journal/bsod.c

@@ -231,7 +231,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-bsod");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/journal/cat.c

@@ -43,7 +43,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-cat");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/journal/journalctl.c

@@ -793,7 +793,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 OPTION_GROUP("Commands"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("journalctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/kernel-install/kernel-install.c

@@ -4,6 +4,8 @@
 #include <sys/utsname.h>
 #include <unistd.h>
 
+#include "sd-json.h"
+
 #include "ansi-color.h"
 #include "argv-util.h"
 #include "boot-entry.h"
@@ -22,7 +24,6 @@
 #include "find-esp.h"
 #include "format-table.h"
 #include "fs-util.h"
-#include "help-util.h"
 #include "id128-util.h"
 #include "image-policy.h"
 #include "kernel-config.h"
@@ -30,7 +31,6 @@
 #include "loop-util.h"
 #include "main-func.h"
 #include "mount-util.h"
-#include "options.h"
 #include "parse-argument.h"
 #include "path-util.h"
 #include "recurse-dir.h"
@@ -64,6 +64,17 @@ STATIC_DESTRUCTOR_REGISTER(arg_image, freep);
 STATIC_DESTRUCTOR_REGISTER(arg_image_policy, image_policy_freep);
 STATIC_DESTRUCTOR_REGISTER(arg_entry_token, freep);
 
+COMMAND(
+        "kernel-install\0",
+        "Add and remove kernel and initrd images to and from the boot partition.",
+        .footer = "This program may also be invoked as 'installkernel':\n"
+                  "  installkernel [OPTION…] VERSION VMLINUZ [MAP] [INSTALLATION-DIR]\n"
+                  "(The optional arguments are passed by kernel build system, but ignored.)",
+        .man_pages = "kernel-install.8\0",
+        .pager_flags = &arg_pager_flags,
+        .flags = COMMAND_HELP_SEPARATE,  /* the verb table is very wide */
+);
+
 typedef enum Action {
         ACTION_ADD,
         ACTION_REMOVE,
@@ -1599,44 +1610,7 @@ static int verb_list(int argc, char *argv[], uintptr_t _data, void *userdata) {
         return table_print_with_pager(table, arg_json_format_flags, arg_pager_flags, arg_legend);
 }
 
-static int help(void) {
-        _cleanup_(table_unrefp) Table *options = NULL, *verbs = NULL;
-        int r;
-
-        r = verbs_get_help_table(&verbs);
-        if (r < 0)
-                return r;
-
-        r = option_parser_get_help_table(&options);
-        if (r < 0)
-                return r;
-
-        /* Note: column widths are not synced, because the verbs table is very wide. */
-
-        help_cmdline("[OPTIONS…] COMMAND …");
-        help_abstract("Add and remove kernel and initrd images to and from the boot partition.");
-
-        help_section("Commands");
-        r = table_print_or_warn(verbs);
-        if (r < 0)
-                return r;
-
-        help_section("Options");
-        r = table_print_or_warn(options);
-        if (r < 0)
-                return r;
-
-        printf("\n"
-               "This program may also be invoked as 'installkernel':\n"
-               "  installkernel [OPTIONS...] VERSION VMLINUZ [MAP] [INSTALLATION-DIR]\n"
-               "(The optional arguments are passed by kernel build system, but ignored.)\n");
-
-        help_man_page_reference("kernel-install", "8");
-
-        return 0;
-}
-
-VERB_COMMON_HELP(help);
+VERB_COMMON_HELP_AUTO_PROGRAM("kernel-install");
 
 static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         assert(argc >= 0);
@@ -1650,7 +1624,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return help();
+                        return command_print_help_full("kernel-install", /* footer_ansi_seq= */ NULL);
 
                 OPTION_COMMON_VERSION:
                         return version();
@@ -1735,6 +1709,9 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                         if (r < 0)
                                 return r;
                         break;
+
+                OPTION_COMMON_INTROSPECT_CLI:
+                        return introspect_cli(arg_json_format_flags);
                 }
 
         if (arg_image && arg_root)
@@ -1745,6 +1722,17 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         return 1;
 }
 
+/* Definition for the compat interface to populate introspection data.
+ * Keep below the VERB definitions for the main command. */
+COMMAND(
+        "installkernel\0",
+        "Add and remove kernel and initrd images to and from the boot partition.",
+        .argspec = "VERSION VMLINUZ [MAP] [INSTALLATION-DIR]\0",
+        .footer = "This is a compat interface intended only to be called from kernel Makefiles.",
+        .man_pages = "kernel-install.8\0",
+        .pager_flags = &arg_pager_flags,
+);
+
 static int run(int argc, char* argv[]) {
         int r;
 

src/keyutil/keyutil.c

@@ -42,7 +42,7 @@ COMMAND(
         .man_pages = "systemd-keyutil.1\0",
 );
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-keyutil");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -56,7 +56,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-keyutil");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/locale/localectl.c

@@ -426,7 +426,7 @@ static int verb_list_x11_keymaps(int argc, char *argv[], uintptr_t _data, void *
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("localectl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         assert(argc >= 0);
@@ -440,7 +440,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("localectl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/login/inhibit.c

@@ -190,7 +190,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-inhibit");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/login/loginctl.c

@@ -1499,7 +1499,7 @@ static int verb_terminate_seat(int argc, char *argv[], uintptr_t _data, void *us
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("loginctl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         int r;
@@ -1514,7 +1514,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("loginctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/machine-id-setup/machine-id-setup-main.c

@@ -47,7 +47,7 @@ static int parse_argv(int argc, char *argv[]) {
                 OPTION_GROUP("Commands"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-machine-id-setup");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/machine/machinectl.c

@@ -2376,7 +2376,7 @@ static int chainload_importctl(char **args) {
         return log_error_errno(r, "Failed to invoke 'importctl': %m");
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("machinectl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -2409,7 +2409,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                         break;
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("machinectl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/measure/measure-tool.c

@@ -72,7 +72,7 @@ COMMAND(
         .pager_flags = &arg_pager_flags,
 );
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-measure");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static char *normalize_phase(const char *s) {
         _cleanup_strv_free_ char **l = NULL;
@@ -101,7 +101,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-measure");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/modules-load/modules-load.c

@@ -350,7 +350,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-modules-load");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/mount/mount-tool.c

@@ -2,6 +2,7 @@
 
 #include "sd-bus.h"
 #include "sd-device.h"
+#include "sd-json.h"
 
 #include "ansi-color.h"
 #include "argv-util.h"
@@ -21,11 +22,9 @@
 #include "format-table.h"
 #include "format-util.h"
 #include "fstab-util.h"
-#include "help-util.h"
 #include "libmount-util.h"
 #include "main-func.h"
 #include "mountpoint-util.h"
-#include "options.h"
 #include "pager.h"
 #include "parse-argument.h"
 #include "parse-util.h"
@@ -41,6 +40,7 @@
 #include "unit-def.h"
 #include "unit-name.h"
 #include "user-util.h"
+#include "verbs.h"
 
 static enum {
         ACTION_DEFAULT,
@@ -86,6 +86,33 @@ STATIC_DESTRUCTOR_REGISTER(arg_description, freep);
 STATIC_DESTRUCTOR_REGISTER(arg_property, strv_freep);
 STATIC_DESTRUCTOR_REGISTER(arg_automount_property, strv_freep);
 
+COMMAND(
+        "systemd-mount\0",
+        "Establish a mount or auto-mount point.",
+        .argspec =
+                "WHAT [WHERE]\0"
+                "--tmpfs [NAME] WHERE\0"
+                "--list\0"
+                "--umount WHAT|WHERE…\0",
+        .option_groups =
+                "Common options\0"
+                "Mount options\0",
+        .man_pages = "systemd-mount.1\0",
+        .flags = COMMAND_VERBS_SHARED,
+        .pager_flags = &arg_pager_flags,
+);
+COMMAND(
+        "systemd-umount\0",
+        "Unmount one or more mount points.",
+        .argspec =
+                "WHAT|WHERE…\0",
+        .option_groups =
+                "Common options\0",
+        .man_pages = "systemd-mount.1\0",
+        .flags = COMMAND_VERBS_SHARED,
+        .pager_flags = &arg_pager_flags,
+);
+
 static int parse_where(const char *input, char **ret_where) {
         int r;
 
@@ -110,46 +137,6 @@ static int parse_where(const char *input, char **ret_where) {
         return 0;
 }
 
-static int help(char *argv[]) {
-        _cleanup_(table_unrefp) Table *options_common = NULL, *options_mount = NULL;
-        int r;
-
-        r = option_parser_get_help_table(&options_common);
-        if (r < 0)
-                return r;
-
-        if (invoked_as(argv, "systemd-umount")) {
-                help_cmdline("[OPTIONS…] WHAT|WHERE…");
-                help_abstract("Unmount one or more mount points.");
-        } else {
-                help_cmdline("[OPTIONS…] WHAT [WHERE]");
-                help_cmdline("[OPTIONS…] --tmpfs [NAME] WHERE");
-                help_cmdline("[OPTIONS…] --list");
-                help_cmdline("[OPTIONS…] --umount WHAT|WHERE…");
-                help_abstract("Establish a mount or auto-mount point.");
-
-                r = option_parser_get_help_table_group("Mount options", &options_mount);
-                if (r < 0)
-                        return r;
-
-                (void) table_sync_column_widths(0, options_common, options_mount);
-        }
-
-        help_section("Options");
-        r = table_print_or_warn(options_common);
-        if (r < 0)
-                return r;
-
-        if (options_mount) {
-                r = table_print_or_warn(options_mount);
-                if (r < 0)
-                        return r;
-        }
-
-        help_man_page_reference("systemd-mount", "1");
-        return 0;
-}
-
 static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         int r;
 
@@ -157,16 +144,26 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         assert(argv);
         assert(remaining_args);
 
-        if (invoked_as(argv, "systemd-umount"))
+        bool is_umount = invoked_as(argv, "systemd-umount");
+
+        const CommandDescription *cmd;
+        assert_se(verbs_find_command(is_umount ? "systemd-umount" : "systemd-mount", &cmd));
+
+        if (is_umount)
                 arg_action = ACTION_UMOUNT;
 
-        OptionParser opts = { argc, argv };
+        OptionParser opts = {
+                argc, argv,
+                .option_groups = cmd->option_groups,
+        };
 
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
 
+                OPTION_GROUP("Common options"): {}
+
                 OPTION_COMMON_HELP:
-                        return help(argv);
+                        return command_print_help_full(cmd->names,  /* footer_ansi_seq= */ NULL);
 
                 OPTION_COMMON_VERSION:
                         return version();
@@ -227,6 +224,9 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                                 return r;
                         break;
 
+                OPTION_COMMON_INTROSPECT_CLI:
+                        return introspect_cli(arg_json_format_flags);
+
                 OPTION_GROUP("Mount options"): {}
 
                 OPTION_LONG("discover", NULL, "Discover mount device metadata"):

src/mstack/mstack-tool.c

@@ -70,7 +70,7 @@ static int parse_argv(int argc, char *argv[]) {
                 OPTION_GROUP("Commands"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-mstack");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/mute-console/mute-console.c

@@ -44,7 +44,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-mute-console");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/network/generator/network-generator-main.c

@@ -169,7 +169,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-network-generator");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/network/networkctl.c

@@ -80,7 +80,7 @@ VERB_SCOPE(, verb_unmask,                     "unmask",             "FILES...",
 VERB_SCOPE(, verb_persistent_storage,         "persistent-storage", "BOOL",          2,        2,        0,
            "Notify systemd-networkd if persistent storage is ready");
 
-VERB_COMMON_HELP_AUTO_HIDDEN("networkctl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         int r;
@@ -95,7 +95,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("networkctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/network/wait-online/wait-online.c

@@ -92,7 +92,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-networkd-wait-online");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/notify/notify.c

@@ -146,7 +146,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-notify");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/nspawn/nspawn.c

@@ -559,7 +559,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-nspawn");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/oom/oomctl.c

@@ -21,7 +21,7 @@ COMMAND(
         .pager_flags = &arg_pager_flags,
 );
 
-VERB_COMMON_HELP_AUTO_HIDDEN("oomctl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 VERB_DEFAULT_NOARG(verb_dump_state, "dump", "Output the current state of systemd-oomd");
 static int verb_dump_state(int argc, char *argv[], uintptr_t _data, void *userdata) {
@@ -54,7 +54,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("oomctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/oom/oomd.c

@@ -37,7 +37,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-oomd");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/path/path-tool.c

@@ -192,7 +192,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-path");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/pcrextend/pcrextend.c

@@ -68,7 +68,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-pcrextend");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/pcrlock/pcrlock.c

@@ -5325,7 +5325,7 @@ static int verb_lock_raw(int argc, char *argv[], uintptr_t _data, void *userdata
 VERB_NOARG(verb_unlock_simple, "unlock-raw",
            "Remove .pcrlock file for raw data");
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-pcrlock");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -5340,7 +5340,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-pcrlock");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/portable/portablectl.c

@@ -1537,7 +1537,7 @@ static int dump_profiles(void) {
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("portablectl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         assert(argc >= 0);
@@ -1551,7 +1551,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("portablectl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/ptyfwd/ptyfwd-tool.c

@@ -46,7 +46,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-pty-forward");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/random-seed/random-seed-tool.c

@@ -322,7 +322,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-random-seed");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/repart/repart.c

@@ -10189,7 +10189,7 @@ static int parse_argv(int argc, char *argv[]) {
                 OPTION_GROUP("Options"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-repart");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/report/report-basic-server.c

@@ -53,7 +53,7 @@ static int parse_argv(int argc, char *argv[]) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-report-basic");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/report/report-cgroup-server.c

@@ -54,7 +54,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-report-cgroup");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/report/report-files-server.c

@@ -54,7 +54,7 @@ static int parse_argv(int argc, char *argv[]) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-report-files");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/report/report-sign-plain.c

@@ -354,7 +354,7 @@ static int parse_argv(int argc, char *argv[]) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-report-sign-plain");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/report/report-sign-tsm.c

@@ -117,7 +117,7 @@ static int parse_argv(int argc, char *argv[]) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-report-sign-tsm");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/report/report.c

@@ -924,7 +924,7 @@ static int vl_server(void) {
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-report");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         int r;
@@ -937,7 +937,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-report");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/resolve/resolvconf-compat.c

@@ -181,7 +181,7 @@ int resolvconf_parse_argv(int argc, char *argv[]) {
                 OPTION_NAMESPACE("resolvconf"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("resolvconf");
+                        return command_print_help_full("resolvconf", /* footer_ansi_seq= */ NULL);
 
                 OPTION_COMMON_VERSION:
                         return version();

src/resolve/resolvectl.c

@@ -3246,7 +3246,7 @@ static void help_dns_classes(void) {
         DUMP_STRING_TABLE(dns_class, int, _DNS_CLASS_MAX);
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("resolvectl");
+VERB_COMMON_HELP_AUTO_PROGRAM_HIDDEN("resolvectl");
 
 COMMAND(
         "systemd-resolve\0",
@@ -3515,7 +3515,7 @@ static int native_parse_argv(int argc, char *argv[], char ***remaining_args) {
                 OPTION_NAMESPACE("resolvectl"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("resolvectl");
+                        return command_print_help_full("resolvectl", /* footer_ansi_seq= */ NULL);
 
                 OPTION_COMMON_VERSION:
                         return version();

src/run/run.c

@@ -208,7 +208,7 @@ static int parse_argv(int argc, char *argv[]) {
                 OPTION_NAMESPACE("systemd-run"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-run");
+                        return command_print_help_full("systemd-run", /* footer_ansi_seq= */ NULL);
 
                 OPTION_COMMON_VERSION:
                         return version();
@@ -784,7 +784,7 @@ static int parse_argv_sudo_mode(int argc, char *argv[]) {
                 OPTION_NAMESPACE("run0"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("run0");
+                        return command_print_help_full("run0", /* footer_ansi_seq= */ NULL);
 
                 OPTION('V', "version", NULL, "Show package version"):
                         return version();

src/sbsign/sbsign.c

@@ -52,7 +52,7 @@ COMMAND(
         .man_pages = "systemd-sbsign.1\0",
 );
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-sbsign");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -66,7 +66,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-sbsign");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/shared/options.c

@@ -4,6 +4,7 @@
 
 #include "format-table.h"
 #include "log.h"
+#include "nulstr-util.h"
 #include "options.h"
 #include "stdio-util.h"
 #include "string-util.h"
@@ -198,18 +199,27 @@ int option_parse(
                  * First, figure out if we have a long option or a short option. */
                 assert(handling_positional_arg || state->argv[state->optind][0] == '-');
 
-                if (handling_positional_arg)
-                        /* We are supposed to return the positional arg to be handled. */
+                if (handling_positional_arg) {
+                        /* Find the positional arg to be handled. */
+
+                        const char *group = NULL;  /* We start in the default unnamed group. */
+
                         for (option = state->namespace_start;; option++) {
                                 /* If OPTION_PARSER_RETURN_POSITIONAL_ARGS is specified,
                                  * OPTION_POSITIONAL must be used. */
                                 assert(option < state->namespace_end);
 
+                                /* If state.option_groups are specified, ignore options outside of the group */
+                                if (FLAGS_SET(option->flags, OPTION_GROUP_MARKER))  /* Start of a new option group */
+                                        group = option->long_code;
+                                if (state->option_groups && !(group && nulstr_contains(state->option_groups, group)))
+                                        continue;
+
                                 if (FLAGS_SET(option->flags, OPTION_POSITIONAL_ENTRY))
                                         break;
                         }
 
-                else if (state->argv[state->optind][1] == '-') {
+                } else if (state->argv[state->optind][1] == '-') {
                         /* We have a long option. */
                         char *eq = strchr(state->argv[state->optind], '=');
                         if (eq) {
@@ -238,6 +248,8 @@ int option_parse(
                         const Option *last_partial = NULL;
                         unsigned n_partial_matches = 0;  /* The commandline option matches a defined prefix. */
 
+                        const char *group = NULL;  /* We start in the default unnamed group. */
+
                         for (option = state->namespace_start;; option++) {
                                 if (option >= state->namespace_end) {
                                         if (n_partial_matches == 0) {
@@ -262,6 +274,12 @@ int option_parse(
                                         break;
                                 }
 
+                                /* If state.option_groups are specified, ignore options outside of the group */
+                                if (FLAGS_SET(option->flags, OPTION_GROUP_MARKER))  /* Start of a new option group */
+                                        group = option->long_code;
+                                if (state->option_groups && !(group && nulstr_contains(state->option_groups, group)))
+                                        continue;
+
                                 if (option_is_metadata(option) || !option->long_code)
                                         continue;
 
@@ -290,6 +308,8 @@ int option_parse(
                 }
                 optname = _optname;
 
+                const char *group = NULL;  /* We start in the default unnamed group. */
+
                 for (option = state->namespace_start;; option++) {
                         if (option >= state->namespace_end) {
                                 r = log_full_errno(LOG_ERR + state->log_level_shift,
@@ -299,6 +319,12 @@ int option_parse(
                                 goto fail;
                         }
 
+                        /* If state.option_groups are specified, ignore options outside of the group */
+                        if (FLAGS_SET(option->flags, OPTION_GROUP_MARKER))  /* Start of a new option group */
+                                group = option->long_code;
+                        if (state->option_groups && !(group && nulstr_contains(state->option_groups, group)))
+                                continue;
+
                         if (option_is_metadata(option) || optchar != option->short_code)
                                 continue;
 
@@ -573,6 +599,7 @@ int _option_parser_get_help_table_full(
 int options_get_help_table_group(
                 const Option options[],
                 const Option options_end[],
+                const char *option_groups,
                 Table **ret,
                 const char **ret_group) {
         int r;
@@ -580,15 +607,24 @@ int options_get_help_table_group(
         assert(ret);
         assert(ret_group);
 
-        _cleanup_(table_unrefp) Table *table = table_new("names", "help");
-        if (!table)
-                return log_oom();
+        _cleanup_(table_unrefp) Table *table = NULL;
 
         assert(options_end > options);
 
         bool group_marker = FLAGS_SET(options[0].flags, OPTION_GROUP_MARKER);
         const char *group = group_marker ? ASSERT_PTR(options[0].long_code) : NULL;
 
+        /* Determine if we should ignore the whole option group. We do this if the option_groups option is
+         * specified and the current group name is not listed. The unnamed group cannot be specified by the
+         * nulstr, so always ignore it. */
+        bool ignore_group = option_groups && !(group && nulstr_contains(option_groups, group));
+
+        if (!ignore_group) {
+                table = table_new("names", "help");
+                if (!table)
+                        return log_oom();
+        }
+
         const Option *opt;
         for (opt = options + group_marker; opt < options_end; opt++) {
                 if (FLAGS_SET(opt->flags, OPTION_NAMESPACE_MARKER))
@@ -599,6 +635,9 @@ int options_get_help_table_group(
                         /* End of the group */
                         break;
 
+                if (ignore_group)
+                        continue;
+
                 if (!opt->help)
                         /* No help string — we do not show the option */
                         continue;
@@ -629,9 +668,11 @@ int options_get_help_table_group(
                         return table_log_add_error(r);
         }
 
-        assert(!table_isempty(table));  /* Empty group? Something is off. */
+        if (!ignore_group) {
+                assert(!table_isempty(table));  /* Empty group? Something is off. */
+                table_set_header(table, false);
+        }
 
-        table_set_header(table, false);
         *ret = TAKE_PTR(table);
         *ret_group = group;
 
@@ -687,6 +728,7 @@ int options_build_json(
                 const Option options[],
                 const Option options_end[],
                 const char *namespace,
+                const char *option_groups,
                 sd_json_variant **ret) {
 
         _cleanup_(sd_json_variant_unrefp) sd_json_variant *array = NULL;
@@ -714,6 +756,10 @@ int options_build_json(
                         /* Positional and help entries are only used for display */
                         continue;
 
+                if (option_groups && !(group && nulstr_contains(option_groups, group)))
+                        /* This group shall be ignored */
+                        continue;
+
                 _cleanup_(sd_json_variant_unrefp) sd_json_variant *o = NULL;
                 r = option_build_json(opt, group, &o);
                 if (r < 0)

src/shared/options.h

@@ -226,6 +226,8 @@ typedef struct OptionParser {
         char **argv;                  /* The argv array, possibly reordered. */
         OptionParserMode mode;
         const char *namespace;        /* The namespace, may be NULL. */
+        const char *option_groups;    /* Optional nulstr with option groups to look at. When specified,
+                                       * only named option groups found in this list are used. */
         int log_level_shift;          /* The log level difference from the default of LOG_ERR.
                                        * Allowed values are -3..4.
                                        * Use 4 == LOG_DEBUG - LOG_ERR to log at debug level. */
@@ -297,6 +299,7 @@ int _option_parser_get_help_table_full(
 int options_get_help_table_group(
                 const Option options[],
                 const Option options_end[],
+                const char *option_groups,
                 Table **ret,
                 const char **ret_group);
 
@@ -306,4 +309,5 @@ int options_build_json(
                 const Option options[],
                 const Option options_end[],
                 const char *namespace,
+                const char *option_groups,
                 sd_json_variant **ret);

src/shared/verbs.c

@@ -72,7 +72,7 @@ static bool verb_is_metadata(const Verb *verb) {
                 FLAGS_SET(ASSERT_PTR(verb)->flags, VERB_GROUP_MARKER);
 }
 
-const Verb* verbs_find_verb(const char *name, const Verb verbs[], const Verb verbs_end[]) {
+const Verb* _verbs_find_verb(const Verb verbs[], const Verb verbs_end[], const char *name) {
         assert(verbs);
         assert(verbs_end > verbs);
         assert((uintptr_t) verbs % sizeof(void*) == 0);
@@ -101,7 +101,7 @@ int _dispatch_verb(char **args, const Verb verbs[], const Verb verbs_end[], void
         const char *name = args ? args[0] : NULL;
         size_t left = strv_length(args);
 
-        const Verb *verb = verbs_find_verb(name, verbs, verbs_end);
+        const Verb *verb = _verbs_find_verb(verbs, verbs_end, name);
         if (!verb) {
                 _cleanup_strv_free_ char **verb_strv = NULL;
 
@@ -224,20 +224,30 @@ static int verb_add_help_one(Table *table, const Verb *verb) {
         return 0;
 }
 
-static const Verb* verbs_get_command(const Verb verbs[], const Verb verbs_end[], const char *name) {
+const Verb* _verbs_find_command(
+                const Verb verbs[],
+                const Verb verbs_end[],
+                const char *name,
+                const CommandDescription **ret_cmd) {
+
         assert(verbs);
         assert(verbs_end > verbs);
         assert((uintptr_t) verbs % sizeof(void*) == 0);
         assert(FLAGS_SET(verbs[0].flags, VERB_COMMAND_MARKER) || verbs[0].verb);
-        assert(name);
 
         for (const Verb *verb = verbs; verb < verbs_end; verb++) {
                 if (!FLAGS_SET(verb->flags, VERB_COMMAND_MARKER))
                         continue;
 
                 const CommandDescription *cmd = (const CommandDescription*) ASSERT_PTR(verb->data);
-                if (nulstr_contains(cmd->names, name))
-                        return verb;
+                if (name && !nulstr_contains(cmd->names, name))
+                        continue;
+
+                /* This function returns the Verb slot through the return value, and the
+                 * CommandDescription it points to in the optional output parameter. */
+                if (ret_cmd)
+                        *ret_cmd = cmd;
+                return verb;
         }
 
         /* At the end of the list? */
@@ -333,7 +343,8 @@ static int print_verb_option_help(
 
                 assert(verb->verb);
 
-                /* What is the the first group? */
+                /* The group marker gives us the group name.
+                 * If it's missing, we're in the default (unnamed) group. */
                 const char *group = FLAGS_SET(verb->flags, VERB_GROUP_MARKER) ? verb->verb : NULL;
 
                 _cleanup_(table_unrefp) Table *table = NULL;
@@ -369,17 +380,19 @@ static int print_verb_option_help(
                         /* End of our namespace */
                         break;
 
-                r = options_get_help_table_group(opt, options_end, &table, &group);
+                r = options_get_help_table_group(opt, options_end, cmd->option_groups, &table, &group);
                 if (r < 0)
                         return r;
 
-                if (!GREEDY_REALLOC0(tables, n_verbs + n_opts + 2))
-                        return -ENOMEM;
-                if (!GREEDY_REALLOC0(groups, n_verbs + n_opts + 2))
-                        return -ENOMEM;
+                if (table) {
+                        if (!GREEDY_REALLOC0(tables, n_verbs + n_opts + 2))
+                                return -ENOMEM;
+                        if (!GREEDY_REALLOC0(groups, n_verbs + n_opts + 2))
+                                return -ENOMEM;
 
-                tables[n_verbs + n_opts] = TAKE_PTR(table);
-                groups[n_verbs + n_opts++] = group ?: "Options";
+                        tables[n_verbs + n_opts] = TAKE_PTR(table);
+                        groups[n_verbs + n_opts++] = group ?: "Options";
+                }
 
                 opt += r; /* Skip over the whole option group */
         }
@@ -431,7 +444,7 @@ static bool verbs_array_has_verbs(const Verb verbs[], const Verb verbs_end[]) {
         return false;
 }
 
-static int print_wrapped(const char *text, bool abstract) {
+static int print_wrapped(const char *text, const char *ansi_seq) {
 
         /* Print the text wrapped at spaces to the specified width. Newlines embedded in the text
          * are preserved and each line is wrapped independently, so explicit line breaks (e.g.
@@ -457,10 +470,9 @@ static int print_wrapped(const char *text, bool abstract) {
         putchar('\n');
 
         STRV_FOREACH(line, lines2)
-                if (abstract)
-                        printf("%s%s%s%s\n",
-                               ansi_highlight(),
-                               ansi_add_italics(),
+                if (ansi_seq)
+                        printf("%s%s%s\n",
+                               ansi_seq,
                                *line,
                                ansi_normal());
                 else
@@ -469,20 +481,39 @@ static int print_wrapped(const char *text, bool abstract) {
         return 0;
 }
 
-int _command_print_help(
+static const Verb* verbs_find_cmd_verbs(const Verb *cmdverb, const Verb verbs_end[]) {
+        assert(cmdverb);
+        assert(FLAGS_SET(cmdverb->flags, VERB_COMMAND_MARKER));
+        assert(cmdverb < verbs_end);
+
+        const CommandDescription *cmd = (const CommandDescription*) ASSERT_PTR(cmdverb->data);
+
+        /* With COMMAND_VERBS_SHARED, we have a group of VERB_COMMAND_MARKER entries, and
+         * then the shared verbs below. Thus, we need to skip over them to locate the
+         * first actual verb. Without COMMAND_VERBS_SHARED, the verbs start immediately
+         * after the VERB_COMMAND_MARKER entry. */
+        const Verb *actual = cmdverb + 1;
+        if (FLAGS_SET(cmd->flags, COMMAND_VERBS_SHARED))
+                while (actual < verbs_end &&
+                       FLAGS_SET(actual->flags, VERB_COMMAND_MARKER) &&
+                       FLAGS_SET(((const CommandDescription*) ASSERT_PTR(actual->data))->flags,
+                                 COMMAND_VERBS_SHARED))
+                        actual++;
+        return actual;
+}
+
+int _command_print_help_full(
                 const Verb verbs[],
                 const Verb verbs_end[],
                 const Option options[],
                 const Option options_end[],
-                const char *name) {
+                const char *name,
+                const char *footer_ansi_seq) {
         int r;
 
-        const Verb *cmdverb = verbs_get_command(verbs, verbs_end, name);
-        if (!cmdverb)
-                return log_error_errno(SYNTHETIC_ERRNO(ENODATA),
-                                       "Command %s not known", name);
-
-        const CommandDescription *cmd = (const CommandDescription*) ASSERT_PTR(cmdverb->data);
+        const CommandDescription *cmd;
+        const Verb *cmdverb = ASSERT_PTR(_verbs_find_command(verbs, verbs_end, name, &cmd));
+        const Verb *verbverbs = ASSERT_PTR(verbs_find_cmd_verbs(cmdverb, verbs_end));
 
         if (cmd->pager_flags)
                 pager_open(*cmd->pager_flags);
@@ -495,19 +526,20 @@ int _command_print_help(
                         help_cmdline(line);
                 }
         else {
-                bool have_verbs = verbs_array_has_verbs(cmdverb + 1, verbs_end);
+                bool have_verbs = verbs_array_has_verbs(verbverbs, verbs_end);
                 help_cmdline(have_verbs ? "[OPTION…] COMMAND …" : "[OPTION…]");
         }
 
-        r = print_wrapped(cmd->abstract, /* abstract= */ true);
+        const char *seq = strjoina(ansi_highlight(), ansi_add_italics());
+        r = print_wrapped(cmd->abstract, seq);
         if (r < 0)
                 return r;
 
-        r = print_verb_option_help(cmd, cmdverb + 1, verbs_end, options, options_end);
+        r = print_verb_option_help(cmd, verbverbs, verbs_end, options, options_end);
         if (r < 0)
                 return log_error_errno(r, "Failed to print verb&option help: %m");
 
-        r = print_wrapped(cmd->footer, /* abstract= */ false);
+        r = print_wrapped(cmd->footer, footer_ansi_seq);
         if (r < 0)
                 return r;
 
@@ -568,9 +600,11 @@ static int command_build_json(
 
         assert(cmdverb);
         assert(FLAGS_SET(cmdverb->flags, VERB_COMMAND_MARKER));
+        assert(cmdverb < verbs_end);
         assert(ret);
 
         const CommandDescription *cmd = (const CommandDescription*) ASSERT_PTR(cmdverb->data);
+        const Verb *verbverbs = verbs_find_cmd_verbs(cmdverb, verbs_end);
 
         NULSTR_FOREACH(name, cmd->names) {
                 r = sd_json_variant_append_arrayb(&names, SD_JSON_BUILD_STRING(name));
@@ -579,11 +613,11 @@ static int command_build_json(
         }
         assert(names);  /* At least the primary name must be defined */
 
-        r = options_build_json(options, options_end, cmd->option_namespace, &opts);
+        r = options_build_json(options, options_end, cmd->option_namespace, cmd->option_groups, &opts);
         if (r < 0)
                 return r;
 
-        for (const Verb *verb = cmdverb + 1; verb < verbs_end; verb++) {
+        for (const Verb *verb = verbverbs; verb < verbs_end; verb++) {
                 if (FLAGS_SET(verb->flags, VERB_COMMAND_MARKER))
                         break;  /* Start of entries for another command */
 

src/shared/verbs.h

@@ -8,6 +8,11 @@
 
 typedef enum CommandFlags {
         COMMAND_HELP_SEPARATE = 1 << 0,  /* Do not synchronize the width between verbs and options */
+        COMMAND_VERBS_SHARED  = 1 << 1,  /* We have a group of COMMANDs with this flag set, and then
+                                          * the VERB definitions below. The commands share the same
+                                          * set of actual VERB definitions. This is useful for programs
+                                          * which are registered under multiple names, but each one
+                                          * behaves very similarly. */
 } CommandFlags;
 
 typedef struct CommandDescription {
@@ -16,7 +21,8 @@ typedef struct CommandDescription {
         const char *argspec;           /* optional specification of positional args in synopsis */
         const char *footer;            /* optional footer to print right above man page links */
         const char *man_pages;         /* nulstr with man page names */
-        const char *option_namespace;  /* to be used when the options are in a namespace */
+        const char *option_namespace;  /* optional option namespace for this command */
+        const char *option_groups;     /* optional nulstr with option groups for this command */
         const PagerFlags *pager_flags; /* optional pointer to the runtime pager flags variable */
         CommandFlags flags;
 } CommandDescription;
@@ -102,7 +108,13 @@ bool running_in_chroot_or_offline(void);
 
 bool should_bypass(const char *env_prefix);
 
-const Verb* verbs_find_verb(const char *name, const Verb verbs[], const Verb verbs_end[]);
+const Verb* _verbs_find_command(const Verb verbs[], const Verb verbs_end[], const char *name, const CommandDescription **ret_cmd);
+#define verbs_find_command(name, ret_cmd)                               \
+        _verbs_find_command(__start_SYSTEMD_VERBS, __stop_SYSTEMD_VERBS, name, ret_cmd)
+
+const Verb* _verbs_find_verb(const Verb verbs[], const Verb verbs_end[], const char *name);
+#define verbs_find_verb(name) \
+        _verbs_find_verb(__start_SYSTEMD_VERBS, __stop_SYSTEMD_VERBS, name)
 
 int _dispatch_verb(char **args, const Verb verbs[], const Verb verbs_end[], void *userdata);
 #define dispatch_verb(args, userdata) \
@@ -131,26 +143,29 @@ int _verbs_get_help_table(
         VERB(verb_help, "help", NULL, VERB_ANY, VERB_ANY, 0, NULL);     \
         _VERB_COMMON_HELP_IMPL(impl)
 
-#define VERB_COMMON_HELP_AUTO(program)                                  \
-        VERB_FULL(verb_help_auto, "help", NULL, VERB_ANY, VERB_ANY, 0, (uintptr_t) program, "Show this help")
+#define VERB_COMMON_HELP_AUTO_FULL(program, help)                       \
+        VERB_FULL(verb_help_auto, "help", NULL, VERB_ANY, VERB_ANY, 0, /* dat= */ (uintptr_t) program, /* help= */ help)
+#define VERB_COMMON_HELP_AUTO_PROGRAM(program) VERB_COMMON_HELP_AUTO_FULL(program, "Show this help")
+#define VERB_COMMON_HELP_AUTO_PROGRAM_HIDDEN(program) VERB_COMMON_HELP_AUTO_FULL(program, /* help= */ NULL)
+#define VERB_COMMON_HELP_AUTO() VERB_COMMON_HELP_AUTO_PROGRAM(/* program= */ NULL)
+#define VERB_COMMON_HELP_AUTO_HIDDEN() VERB_COMMON_HELP_AUTO_PROGRAM_HIDDEN(/* program= */ NULL)
 
-#define VERB_COMMON_HELP_AUTO_HIDDEN(program)                           \
-        VERB_FULL(verb_help_auto, "help", NULL, VERB_ANY, VERB_ANY, 0, (uintptr_t) program, NULL)
-
-int _command_print_help(
+int _command_print_help_full(
                 const Verb verbs[],
                 const Verb verbs_end[],
                 const Option options[],
                 const Option options_end[],
-                const char *name);
-#define command_print_help(name)                                        \
-        _command_print_help(                                            \
+                const char *name,
+                const char *footer_ansi_seq);
+#define command_print_help_full(name, footer_ansi_seq)                  \
+        _command_print_help_full(                                       \
                 __start_SYSTEMD_VERBS, __stop_SYSTEMD_VERBS,            \
                 __start_SYSTEMD_OPTIONS, __stop_SYSTEMD_OPTIONS,        \
-                name)
+                name, footer_ansi_seq)
+#define command_print_help() command_print_help_full(/* name= */ NULL, /* footer_ansi_seq= */ NULL)
 
 static inline int verb_help_auto(int argc, char **argv, uintptr_t data, void *userdata) {
-        return command_print_help((const char*) ASSERT_PTR(data));
+        return command_print_help_full((const char*) data, /* footer_ansi_seq= */ NULL);
 }
 
 /* Print a machine-readable description of the program's commands, verbs, and options in the format

src/sleep/sleep.c

@@ -699,7 +699,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-sleep");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/socket-activate/socket-activate.c

@@ -339,7 +339,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-socket-activate");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/socket-proxy/socket-proxyd.c

@@ -506,7 +506,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-socket-proxyd");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/ssh-generator/ssh-issue.c

@@ -130,7 +130,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-ssh-issue");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/stdio-bridge/stdio-bridge.c

@@ -40,7 +40,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-stdio-bridge");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/storage/storage-block.c

@@ -395,7 +395,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-storage-block");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/storage/storage-fs.c

@@ -755,7 +755,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-storage-fs");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/storage/storagectl.c

@@ -53,7 +53,7 @@ COMMAND(
         .pager_flags = &arg_pager_flags,
 );
 
-VERB_COMMON_HELP_AUTO_HIDDEN("storagectl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static const char *ro_color(int ro) {
         if (ro > 0)
@@ -391,7 +391,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 OPTION_NAMESPACE("storagectl"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("storagectl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/storagetm/storagetm.c

@@ -67,7 +67,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-storagetm");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/sysctl/sysctl.c

@@ -439,7 +439,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 OPTION_GROUP("Commands"): {}
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-sysctl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/sysext/sysext.c

@@ -38,7 +38,6 @@
 #include "format-table.h"
 #include "fs-util.h"
 #include "hashmap.h"
-#include "help-util.h"
 #include "image-policy.h"
 #include "initrd-util.h"
 #include "label-util.h"                 /* IWYU pragma: keep */
@@ -49,7 +48,6 @@
 #include "mkdir.h"
 #include "mount-util.h"
 #include "mountpoint-util.h"
-#include "options.h"
 #include "os-util.h"
 #include "pager.h"
 #include "parse-argument.h"
@@ -133,14 +131,27 @@ static ImageClass arg_image_class = IMAGE_SYSEXT;
 STATIC_DESTRUCTOR_REGISTER(arg_root, freep);
 STATIC_DESTRUCTOR_REGISTER(arg_image_policy, image_policy_freep);
 
+COMMAND(
+        "systemd-sysext\0",
+        "Merge system extension images into /usr/ and /opt/.",
+        .man_pages = "systemd-sysext.8\0",
+        .flags = COMMAND_VERBS_SHARED,
+        .pager_flags = &arg_pager_flags,
+);
+COMMAND(
+        "systemd-confext\0",
+        "Merge configuration extension images into /etc/.",
+        .man_pages = "systemd-confext.8\0",
+        .flags = COMMAND_VERBS_SHARED,
+        .pager_flags = &arg_pager_flags,
+);
+
 /* Helper struct for naming simplicity and reusability */
 static const struct {
-        const char *full_identifier;
         const char *short_identifier;
         const char *short_identifier_plural;
         const char *polkit_rw_action_id;
         const char *polkit_ro_action_id;
-        const char *blurb;
         const char *dot_directory_name;
         const char *directory_name;
         const char *level_env;
@@ -152,12 +163,10 @@ static const struct {
         unsigned long default_mount_flags;
 } image_class_info[_IMAGE_CLASS_MAX] = {
         [IMAGE_SYSEXT] = {
-                .full_identifier = "systemd-sysext",
                 .short_identifier = "sysext",
                 .short_identifier_plural = "extensions",
                 .polkit_rw_action_id = "io.systemd.sysext.manage",
                 .polkit_ro_action_id = "io.systemd.sysext.read",
-                .blurb = "Merge system extension images into /usr/ and /opt/.",
                 .dot_directory_name = ".systemd-sysext",
                 .level_env = "SYSEXT_LEVEL",
                 .scope_env = "SYSEXT_SCOPE",
@@ -168,12 +177,10 @@ static const struct {
                 .default_mount_flags = MS_RDONLY|MS_NODEV,
         },
         [IMAGE_CONFEXT] = {
-                .full_identifier = "systemd-confext",
                 .short_identifier = "confext",
                 .short_identifier_plural = "confexts",
                 .polkit_rw_action_id = "io.systemd.confext.manage",
                 .polkit_ro_action_id = "io.systemd.confext.read",
-                .blurb = "Merge configuration extension images into /etc/.",
                 .dot_directory_name = ".systemd-confext",
                 .level_env = "CONFEXT_LEVEL",
                 .scope_env = "CONFEXT_SCOPE",
@@ -3129,46 +3136,13 @@ static int vl_method_list(sd_varlink *link, sd_json_variant *parameters, sd_varl
         return 0;
 }
 
-static int help(void) {
-        _cleanup_(table_unrefp) Table *verbs = NULL, *commands = NULL, *options = NULL;
-        int r;
-
-        r = verbs_get_help_table(&verbs);
-        if (r < 0)
-                return r;
-
-        r = option_parser_get_help_table(&commands);
-        if (r < 0)
-                return r;
-
-        r = option_parser_get_help_table_group("Options", &options);
-        if (r < 0)
-                return r;
-
-        (void) table_sync_column_widths(0, verbs, commands, options);
-
-        help_cmdline("[OPTIONS...] COMMAND");
-        help_abstract(image_class_info[arg_image_class].blurb);
-
-        help_section("Commands");
-        r = table_print_or_warn(verbs);
-        if (r < 0)
-                return r;
-        r = table_print_or_warn(commands);
-        if (r < 0)
-                return r;
-
-        help_section("Options");
-        r = table_print_or_warn(options);
-        if (r < 0)
-                return r;
-
-        help_man_page_reference(image_class_info[arg_image_class].full_identifier, "8");
-        return 0;
+VERB_FULL(verb_help, "help", NULL, VERB_ANY, VERB_ANY, 0, /* dat= */ 0u, /* help= */ NULL);
+static int verb_help(int argc, char **argv, uintptr_t data, void *userdata) {
+        return command_print_help_full(
+                        arg_image_class == IMAGE_SYSEXT ? "systemd-sysext" : "systemd-confext",
+                        /* footer_ansi_seq= */ NULL);
 }
 
-VERB_COMMON_HELP_HIDDEN(help);
-
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         int r;
 
@@ -3182,13 +3156,13 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return help();
+                        return command_print_help_full(
+                                        arg_image_class == IMAGE_SYSEXT ? "systemd-sysext" : "systemd-confext",
+                                        /* footer_ansi_seq= */ NULL);
 
                 OPTION_COMMON_VERSION:
                         return version();
 
-                OPTION_GROUP("Options"): {}
-
                 OPTION_LONG("root", "PATH", "Operate relative to root PATH"):
                         r = parse_path_argument(opts.arg, false, &arg_root);
                         if (r < 0)
@@ -3255,6 +3229,9 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                         if (r <= 0)
                                 return r;
                         break;
+
+                OPTION_COMMON_INTROSPECT_CLI:
+                        return introspect_cli(arg_json_format_flags);
                 }
 
         r = sd_varlink_invocation(SD_VARLINK_ALLOW_ACCEPT);

src/sysinstall/sysinstall.c

@@ -174,7 +174,7 @@ static int parse_argv(int argc, char *argv[]) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-sysinstall");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/systemctl/systemctl-compat-halt.c

@@ -1,12 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "sd-daemon.h"
+#include "sd-json.h"
 
 #include "ansi-color.h"
-#include "format-table.h"
-#include "help-util.h"
 #include "log.h"
-#include "options.h"
 #include "process-util.h"
 #include "reboot-util.h"
 #include "systemctl.h"
@@ -15,40 +13,35 @@
 #include "systemctl-start-unit.h"
 #include "systemctl-util.h"
 #include "utmp-wtmp.h"
+#include "verbs.h"
 
-static int halt_help(void) {
-        _cleanup_(table_unrefp) Table *options = NULL;
-        int r;
+COMMAND(
+        "halt\0",
+        "Halt the system.",
+        .footer = "This is a compatibility interface, please use the more powerful "
+                  "'systemctl halt' command instead.",
+        .man_pages = "halt.8\0",
+        .option_namespace = "halt",
+);
 
-        r = option_parser_get_help_table_ns("halt", &options);
-        if (r < 0)
-                return r;
+COMMAND(
+        "poweroff\0",
+        "Power off the system.",
+        .footer = "This is a compatibility interface, please use the more powerful "
+                  "'systemctl poweroff' command instead.",
+        .man_pages = "poweroff.8\0",
+        .option_namespace = "halt",
+);
 
-        /* Note: if you are tempted to add new command line switches here, please do not. Let this
-         * compatibility command rest in peace. Its interface is not even owned by us as much as it is by
-         * sysvinit. If you add something new, add it to "systemctl halt", "systemctl reboot", "systemctl
-         * poweroff" instead. */
-
-        help_cmdline(arg_action == ACTION_REBOOT ? "[OPTIONS…] [ARG]" : "[OPTIONS…]");
-        help_abstract(arg_action == ACTION_REBOOT   ? "Reboot the system." :
-                      arg_action == ACTION_POWEROFF ? "Power off the system." :
-                                                      "Halt the system.");
-
-        help_section("Options");
-        r = table_print_or_warn(options);
-        if (r < 0)
-                return r;
-
-        printf("\n%sThis is a compatibility interface, please use the more powerful 'systemctl %s' command instead.%s\n",
-               ansi_highlight_red(),
-               arg_action == ACTION_REBOOT   ? "reboot" :
-               arg_action == ACTION_POWEROFF ? "poweroff" :
-                                               "halt",
-               ansi_normal());
-
-        help_man_page_reference("halt", "8");
-        return 0;
-}
+COMMAND(
+        "reboot\0",
+        "Reboot the system.",
+        .argspec = "[ARG]\0",
+        .footer = "This is a compatibility interface, please use the more powerful "
+                  "'systemctl reboot' command instead.",
+        .man_pages = "reboot.8\0",
+        .option_namespace = "halt",
+);
 
 int halt_parse_argv(int argc, char *argv[], int log_level_shift) {
         int r;
@@ -62,13 +55,20 @@ int halt_parse_argv(int argc, char *argv[], int log_level_shift) {
                 .log_level_shift = log_level_shift,
         };
 
+        /* Note: if you are tempted to add new command line switches here, please do not. Let this
+         * compatibility command rest in peace. Its interface is not even owned by us as much as it
+         * is by sysvinit. If you add something new, add it to "systemctl halt", "systemctl
+         * reboot", "systemctl poweroff" instead. */
+
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
 
                 OPTION_NAMESPACE("halt"): {}
 
                 OPTION_LONG("help", NULL, "Show this help"):
-                        return halt_help();
+                        return command_print_help_full(
+                                        action_table[arg_action].verb,
+                                        /* footer_ansi_seq= */ ansi_highlight_red());
 
                 OPTION_LONG("halt", NULL, "Halt the machine"):
                         arg_action = ACTION_HALT;
@@ -108,6 +108,9 @@ int halt_parse_argv(int argc, char *argv[], int log_level_shift) {
                 OPTION_SHORT('h', NULL, /* help= */ NULL):
                         /* Compatibility nops */
                         break;
+
+                OPTION_COMMON_INTROSPECT_CLI:
+                        return introspect_cli(SD_JSON_FORMAT_OFF);
                 }
 
         char **args = option_parser_get_args(&opts);

src/systemctl/systemctl-compat-shutdown.c

@@ -1,10 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "sd-json.h"
+
 #include "ansi-color.h"
-#include "format-table.h"
-#include "help-util.h"
 #include "log.h"
-#include "options.h"
 #include "parse-util.h"
 #include "reboot-util.h"
 #include "string-util.h"
@@ -12,35 +11,17 @@
 #include "systemctl.h"
 #include "systemctl-compat-shutdown.h"
 #include "time-util.h"
+#include "verbs.h"
 
-static int shutdown_help(void) {
-        _cleanup_(table_unrefp) Table *options = NULL;
-        int r;
-
-        r = option_parser_get_help_table_ns("shutdown", &options);
-        if (r < 0)
-                return r;
-
-        /* Note: if you are tempted to add new command line switches here, please do not. Let this
-         * compatibility command rest in peace. Its interface is not even owned by us as much as it is by
-         * sysvinit. If you add something new, add it to "systemctl halt", "systemctl reboot", "systemctl
-         * poweroff" instead. */
-
-        help_cmdline("[OPTIONS…] [TIME] [WALL…]");
-        help_abstract("Shut down the system.");
-
-        help_section("Options");
-        r = table_print_or_warn(options);
-        if (r < 0)
-                return r;
-
-        printf("\n%sThis is a compatibility interface, please use the more powerful 'systemctl halt',\n"
-               "'systemctl poweroff', 'systemctl reboot' commands instead.%s\n",
-               ansi_highlight_red(), ansi_normal());
-
-        help_man_page_reference("shutdown", "8");
-        return 0;
-}
+COMMAND(
+        "shutdown\0",
+        "Shut down the system.",
+        .argspec = "[TIME] [WALL…]\0",
+        .footer = "This is a compatibility interface, please use the more powerful 'systemctl halt', "
+                  "'systemctl poweroff', 'systemctl reboot' commands instead.",
+        .man_pages = "shutdown.8\0",
+        .option_namespace = "shutdown",
+);
 
 static int parse_shutdown_time_spec(const char *t, usec_t *ret) {
         int r;
@@ -128,13 +109,20 @@ int shutdown_parse_argv(int argc, char *argv[], int log_level_shift) {
                 .log_level_shift = log_level_shift,
         };
 
+        /* Note: if you are tempted to add new command line switches here, please do not. Let this
+         * compatibility command rest in peace. Its interface is not even owned by us as much as it
+         * is by sysvinit. If you add something new, add it to "systemctl halt", "systemctl
+         * reboot", "systemctl poweroff" instead. */
+
         FOREACH_OPTION_OR_RETURN(c, &opts)
                 switch (c) {
 
                 OPTION_NAMESPACE("shutdown"): {}
 
                 OPTION_LONG("help", NULL, "Show this help"):
-                        return shutdown_help();
+                        return command_print_help_full(
+                                        "shutdown",
+                                        /* footer_ansi_seq= */ ansi_highlight_red());
 
                 OPTION('H', "halt", NULL, "Halt the machine"):
                         arg_action = ACTION_HALT;
@@ -182,6 +170,9 @@ int shutdown_parse_argv(int argc, char *argv[], int log_level_shift) {
                 OPTION_SHORT('F', NULL,  /* help= */ NULL): {}
                 OPTION_SHORT('t', "ARG", /* help= */ NULL):
                         break;
+
+                OPTION_COMMON_INTROSPECT_CLI:
+                        return introspect_cli(SD_JSON_FORMAT_OFF);
                 }
 
         char **args = option_parser_get_args(&opts);

src/systemctl/systemctl.c

@@ -3,17 +3,16 @@
 #include <signal.h>
 #include <unistd.h>
 
+#include "sd-json.h"
+
 #include "argv-util.h"
 #include "build.h"
 #include "bus-print-properties.h"
 #include "bus-util.h"
 #include "capsule-util.h"
 #include "extract-word.h"
-#include "format-table.h"
-#include "help-util.h"
 #include "image-policy.h"
 #include "install.h"
-#include "options.h"
 #include "output-mode.h"
 #include "pager.h"
 #include "parse-argument.h"
@@ -112,58 +111,13 @@ STATIC_DESTRUCTOR_REGISTER(arg_drop_in, unsetp);
 STATIC_DESTRUCTOR_REGISTER(arg_image_policy, image_policy_freep);
 STATIC_DESTRUCTOR_REGISTER(arg_kill_subgroup, freep);
 
-static int systemctl_help(void) {
-        static const char *const vgroups[] = {
-                "Unit Commands",
-                "Unit File Commands",
-                "Machine Commands",
-                "Job Commands",
-                "Environment Commands",
-                "Manager State Commands",
-                "System Commands",
-        };
-
-        Table *vtables[ELEMENTSOF(vgroups)] = {};
-        CLEANUP_ELEMENTS(vtables, table_unref_array_clear);
-        _cleanup_(table_unrefp) Table *options_table = NULL;
-        int r;
-
-        for (size_t i = 0; i < ELEMENTSOF(vgroups); i++) {
-                r = verbs_get_help_table_group(vgroups[i], &vtables[i]);
-                if (r < 0)
-                        return r;
-        }
-
-        r = option_parser_get_help_table_ns("systemctl", &options_table);
-        if (r < 0)
-                return r;
-
-        assert_cc(ELEMENTSOF(vtables) == 7);
-        (void) table_sync_column_widths(0, options_table,
-                                        vtables[0], vtables[1], vtables[2], vtables[3],
-                                        vtables[4], vtables[5], vtables[6]);
-
-        pager_open(arg_pager_flags);
-
-        help_cmdline("[OPTIONS…] COMMAND …");
-        help_abstract("Query or send control commands to the system manager.");
-
-        for (size_t i = 0; i < ELEMENTSOF(vgroups); i++) {
-                help_section(vgroups[i]);
-                r = table_print_or_warn(vtables[i]);
-                if (r < 0)
-                        return r;
-        }
-
-        help_section("Options");
-        r = table_print_or_warn(options_table);
-        if (r < 0)
-                return r;
-
-        help_man_page_reference("systemctl", "1");
-
-        return 0;
-}
+COMMAND(
+        "systemctl\0",
+        "Query or send control commands to the system manager.",
+        .man_pages = "systemctl.1\0",
+        .option_namespace = "systemctl",
+        .pager_flags = &arg_pager_flags,
+);
 
 static int parse_property_argument(const char *value, char ***properties) {
         int r;
@@ -397,7 +351,7 @@ static int systemctl_parse_argv(int argc, char *argv[], int log_level_shift, cha
                 OPTION_NAMESPACE("systemctl"): {}
 
                 OPTION_COMMON_HELP:
-                        return systemctl_help();
+                        return command_print_help_full("systemctl", /* footer_ansi_seq= */ NULL);
 
                 OPTION_COMMON_VERSION:
                         return version();
@@ -880,6 +834,9 @@ static int systemctl_parse_argv(int argc, char *argv[], int log_level_shift, cha
                                    "      %s [OPTIONS…] COMMAND -- -.%s …",
                                    program_invocation_name, opts.arg ?: "mount");
                         return -EINVAL;
+
+                OPTION_COMMON_INTROSPECT_CLI:
+                        return introspect_cli(SD_JSON_FORMAT_OFF);
                 }
 
         /* If we are in --user mode, there's no point in talking to PolicyKit or the infra to query system
@@ -1136,8 +1093,7 @@ VERB_SCOPE(, verb_start,             "condrestart",      NULL, 2,      VERB_ANY,
 VERB_SCOPE(, verb_is_active,         "check",            NULL, 2,      VERB_ANY, VERB_ONLINE_ONLY, /* help= */ NULL); /* deprecated alias of is-active */
 
 int systemctl_main(char **args) {
-        assert((uintptr_t) __start_SYSTEMD_VERBS % sizeof(void*) == 0);
-        const Verb *verb = verbs_find_verb(args[0], __start_SYSTEMD_VERBS, __stop_SYSTEMD_VERBS);
+        const Verb *verb = verbs_find_verb(args[0]);
 
         if (verb && (verb->flags & VERB_ONLINE_ONLY) && arg_root)
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),

src/sysupdate/sysupdate.c

@@ -3306,7 +3306,7 @@ static int verb_enable_component(int argc, char *argv[], uintptr_t _data, void *
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("systemd-sysupdate");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***remaining_args) {
         assert(argc >= 0);
@@ -3320,7 +3320,7 @@ static int parse_argv(int argc, char *argv[], char ***remaining_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-sysupdate");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/sysupdate/updatectl.c

@@ -1641,7 +1641,7 @@ static int verb_enable(int argc, char *argv[], uintptr_t _data, void *userdata)
         return 0;
 }
 
-VERB_COMMON_HELP_AUTO_HIDDEN("updatectl");
+VERB_COMMON_HELP_AUTO_HIDDEN();
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -1653,7 +1653,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("updatectl");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();

src/sysusers/sysusers.c

@@ -2124,7 +2124,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                         break;
 
                 OPTION_COMMON_HELP:
-                        return command_print_help("systemd-sysusers");
+                        return command_print_help();
 
                 OPTION_COMMON_VERSION:
                         return version();