From: Zbigniew Jędrzejewski-Szmek <zbyszek@amutable.com>
Date: Fri, 24 Jul 2026 19:15:24 +0000 (+0200)
Subject: resolvectl: drop --help for systemd-resolve
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=580489eeec04f98553ce1c85e2052270610f1d50;p=thirdparty%2Fsystemd.git

resolvectl: drop --help for systemd-resolve

The rename was done in v239. We generally don't document obsolete
interfaces, so let's just drop the (very nice) --help that we have here.
---

diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
index 9af5626059d..96ce7539fc4 100644
--- a/src/resolve/resolvectl.c
+++ b/src/resolve/resolvectl.c
@@ -3211,32 +3211,6 @@ static void help_dns_classes(void) {
         DUMP_STRING_TABLE(dns_class, int, _DNS_CLASS_MAX);
 }
 
-static int compat_help(void) {
-        _cleanup_(table_unrefp) Table *options = NULL;
-        int r;
-
-        r = option_parser_get_help_table_ns("systemd-resolve", &options);
-        if (r < 0)
-                return r;
-
-        pager_open(arg_pager_flags);
-
-        help_cmdline("[OPTIONS…] HOSTNAME|ADDRESS…");
-        help_cmdline("[OPTIONS…] --service [[NAME] TYPE] DOMAIN");
-        help_cmdline("[OPTIONS…] --openpgp EMAIL@DOMAIN…");
-        help_cmdline("[OPTIONS…] --statistics");
-        help_cmdline("[OPTIONS…] --reset-statistics");
-        help_abstract("Resolve domain names, IPv4 and IPv6 addresses, DNS records, and services.");
-
-        help_section("Options");
-        r = table_print_or_warn(options);
-        if (r < 0)
-                return r;
-
-        help_man_page_reference("resolvectl", "1");
-        return 0;
-}
-
 static int native_help(void) {
         _cleanup_(table_unrefp) Table *verbs = NULL, *options = NULL;
         int r;
@@ -3288,7 +3262,8 @@ static int compat_parse_argv(int argc, char *argv[], char ***remaining_args) {
                 OPTION_NAMESPACE("systemd-resolve"): {}
 
                 OPTION_COMMON_HELP:
-                        return compat_help();
+                        printf("systemd-resolve is deprecated. Call resolvectl instead.\n");
+                        return 0;
 
                 OPTION_COMMON_VERSION:
                         return version();