rules.d/60-gpiochip.rules

@@ -1,17 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-ACTION=="remove", GOTO="gpiochip_end"
-SUBSYSTEM!="gpio", GOTO="gpiochip_end"
-
-KERNEL!="gpiochip[0-9]*", GOTO="gpiochip_end"
-
-IMPORT{builtin}="path_id"
-ENV{ID_PATH_WITH_USB_REVISION}=="?*", SYMLINK+="gpio/by-path/$env{ID_PATH_WITH_USB_REVISION}"
-
-SUBSYSTEMS=="usb", IMPORT{builtin}="usb_id"
-ENV{ID_BUS}=="", GOTO="gpiochip_end"
-ENV{ID_SERIAL}=="", GOTO="gpiochip_end"
-ENV{ID_USB_INTERFACE_NUM}=="", GOTO="gpiochip_end"
-SYMLINK+="gpio/by-id/$env{ID_BUS}-$env{ID_SERIAL}-if$env{ID_USB_INTERFACE_NUM}"
-
-LABEL="gpiochip_end"

rules.d/meson.build

@@ -12,7 +12,6 @@ rules = [
                '60-drm.rules',
                '60-evdev.rules',
                '60-fido-id.rules',
-               '60-gpiochip.rules',
                '60-infiniband.rules',
                '60-input-id.rules',
                '60-persistent-alsa.rules',

src/libsystemd-network/test-ndisc-rs.c

@@ -22,6 +22,8 @@ static struct ether_addr mac_addr = {
         .ether_addr_octet = {'A', 'B', 'C', '1', '2', '3'}
 };
 
+static bool verbose = false;
+
 static void router_dump(sd_ndisc_router *rt) {
         struct in6_addr addr;
         uint8_t hop_limit;
@@ -186,7 +188,8 @@ static int send_ra(uint8_t flags) {
         assert_se(write(test_fd[1], advertisement, sizeof(advertisement)) ==
                   sizeof(advertisement));
 
-        log_debug("%s: Sent RA with flag 0x%02x", __func__, flags);
+        if (verbose)
+                printf("  sent RA with flag 0x%02x\n", flags);
 
         return 0;
 }
@@ -216,7 +219,8 @@ static void test_callback_ra(sd_ndisc *nd, sd_ndisc_event_t event, void *message
         assert_se(flags == flags_array[idx]);
         idx++;
 
-        log_debug("%s: Got event 0x%02" PRIx64, __func__, flags);
+        if (verbose)
+                printf("  got event 0x%02" PRIx64 "\n", flags);
 
         if (idx < ELEMENTSOF(flags_array)) {
                 send_ra(flags_array[idx]);
@@ -305,10 +309,13 @@ static int send_ra_invalid_domain(uint8_t flags) {
 
         advertisement[5] = flags;
 
+        printf("sizeof(nd_router_advert)=%zu\n", sizeof(struct nd_router_advert));
+
         assert_se(write(test_fd[1], advertisement, sizeof(advertisement)) ==
                   sizeof(advertisement));
 
-        log_debug("%s: Sent RA with flag 0x%02x", __func__, flags);
+        if (verbose)
+                printf("  sent RA with flag 0x%02x\n", flags);
 
         return 0;
 }
@@ -384,8 +391,8 @@ static int send_na(uint32_t flags) {
         ((struct nd_neighbor_advert*) advertisement)->nd_na_flags_reserved = flags;
 
         assert_se(write(test_fd[1], advertisement, sizeof(advertisement)) == sizeof(advertisement));
-
+        if (verbose)
-        log_debug("%s: Sent NA with flag 0x%02x", __func__, flags);
+                printf("  sent NA with flag 0x%02x\n", flags);
 
         return 0;
 }
@@ -415,7 +422,8 @@ static void test_callback_na(sd_ndisc *nd, sd_ndisc_event_t event, void *message
         assert_se(flags == flags_array[idx]);
         idx++;
 
-        log_debug("%s: Got event 0x%02" PRIx32, __func__, flags);
+        if (verbose)
+                printf("  got event 0x%02" PRIx32 "\n", flags);
 
         if (idx < ELEMENTSOF(flags_array)) {
                 send_na(flags_array[idx]);

src/resolve/resolvectl.c

@@ -102,27 +102,11 @@ typedef enum StatusMode {
         STATUS_DEFAULT_ROUTE,
         STATUS_LLMNR,
         STATUS_MDNS,
-        STATUS_DNS_OVER_TLS,
+        STATUS_PRIVATE,
         STATUS_DNSSEC,
         STATUS_NTA,
-        _STATUS_MAX,
-        _STATUS_INVALID = -EINVAL,
 } StatusMode;
 
-static const char* const status_mode_json_field_table[_STATUS_MAX] = {
-        [STATUS_ALL]           = NULL,
-        [STATUS_DNS]           = "servers",
-        [STATUS_DOMAIN]        = "searchDomains",
-        [STATUS_DEFAULT_ROUTE] = "defaultRoute",
-        [STATUS_LLMNR]         = "llmnr",
-        [STATUS_MDNS]          = "mDNS",
-        [STATUS_DNS_OVER_TLS]  = "dnsOverTLS",
-        [STATUS_DNSSEC]        = "dnssec",
-        [STATUS_NTA]           = "negativeTrustAnchors",
-};
-
-DEFINE_PRIVATE_STRING_TABLE_LOOKUP_TO_STRING(status_mode_json_field, StatusMode);
-
 typedef struct InterfaceInfo {
         int index;
         const char *name;
@@ -1809,6 +1793,41 @@ static char** global_protocol_status(const GlobalInfo *info) {
         return TAKE_PTR(s);
 }
 
+static const char* status_mode_to_json_field(StatusMode mode) {
+        switch (mode) {
+
+        case STATUS_ALL:
+                return NULL;
+
+        case STATUS_DNS:
+                return "servers";
+
+        case STATUS_DOMAIN:
+                return "searchDomains";
+
+        case STATUS_DEFAULT_ROUTE:
+                return "defaultRoute";
+
+        case STATUS_LLMNR:
+                return "llmnr";
+
+        case STATUS_MDNS:
+                return "mDNS";
+
+        case STATUS_PRIVATE:
+                return "dnsOverTLS";
+
+        case STATUS_DNSSEC:
+                return "dnssec";
+
+        case STATUS_NTA:
+                return "negativeTrustAnchors";
+
+        default:
+                assert_not_reached();
+        }
+}
+
 static int status_json_filter_fields(sd_json_variant **configuration, StatusMode mode) {
         _cleanup_(sd_json_variant_unrefp) sd_json_variant *v = NULL;
         sd_json_variant *w;
@@ -1817,7 +1836,7 @@ static int status_json_filter_fields(sd_json_variant **configuration, StatusMode
 
         assert(configuration);
 
-        field = status_mode_json_field_to_string(mode);
+        field = status_mode_to_json_field(mode);
         if (!field)
                 /* Nothing to filter for this mode. */
                 return 0;
@@ -1850,6 +1869,7 @@ static int status_json_filter_links(sd_json_variant **configuration, char **link
         if (links)
                 STRV_FOREACH(ifname, links) {
                         int ifindex = rtnl_resolve_interface_or_warn(/* rtnl= */ NULL, *ifname);
+
                         if (ifindex < 0)
                                 return ifindex;
 
@@ -2017,7 +2037,7 @@ static int status_ifindex(sd_bus *bus, int ifindex, const char *name, StatusMode
 
                 return 0;
 
-        case STATUS_DNS_OVER_TLS:
+        case STATUS_PRIVATE:
                 printf("%sLink %i (%s)%s: %s\n",
                        ansi_highlight(), ifindex, name, ansi_normal(),
                        strna(link_info.dns_over_tls));
@@ -2245,7 +2265,7 @@ static int status_global(sd_bus *bus, StatusMode mode, bool *empty_line) {
 
                 return 0;
 
-        case STATUS_DNS_OVER_TLS:
+        case STATUS_PRIVATE:
                 printf("%sGlobal%s: %s\n", ansi_highlight(), ansi_normal(),
                        strna(global_info.dns_over_tls));
 
@@ -2990,10 +3010,10 @@ static int verb_dns_over_tls(int argc, char **argv, void *userdata) {
         }
 
         if (arg_ifindex <= 0)
-                return status_all(bus, STATUS_DNS_OVER_TLS);
+                return status_all(bus, STATUS_PRIVATE);
 
         if (argc < 3)
-                return status_ifindex(bus, arg_ifindex, NULL, STATUS_DNS_OVER_TLS, NULL);
+                return status_ifindex(bus, arg_ifindex, NULL, STATUS_PRIVATE, NULL);
 
         (void) polkit_agent_open_if_enabled(BUS_TRANSPORT_LOCAL, arg_ask_password);
 

src/resolve/resolved-dns-scope.c

@@ -1793,18 +1793,16 @@ bool dns_scope_is_default_route(DnsScope *scope) {
                 return true;
 }
 
-int dns_scope_to_json(DnsScope *scope, bool with_cache, sd_json_variant **ret) {
+int dns_scope_dump_cache_to_json(DnsScope *scope, sd_json_variant **ret) {
         _cleanup_(sd_json_variant_unrefp) sd_json_variant *cache = NULL;
         int r;
 
         assert(scope);
         assert(ret);
 
-        if (with_cache) {
+        r = dns_cache_dump_to_json(&scope->cache, &cache);
-                r = dns_cache_dump_to_json(&scope->cache, &cache);
+        if (r < 0)
-                if (r < 0)
+                return r;
-                        return r;
-        }
 
         return sd_json_buildo(
                         ret,
@@ -1812,7 +1810,7 @@ int dns_scope_to_json(DnsScope *scope, bool with_cache, sd_json_variant **ret) {
                         SD_JSON_BUILD_PAIR_CONDITION(scope->family != AF_UNSPEC, "family", SD_JSON_BUILD_INTEGER(scope->family)),
                         SD_JSON_BUILD_PAIR_CONDITION(!!scope->link, "ifindex", SD_JSON_BUILD_INTEGER(dns_scope_ifindex(scope))),
                         SD_JSON_BUILD_PAIR_CONDITION(!!scope->link, "ifname", SD_JSON_BUILD_STRING(dns_scope_ifname(scope))),
-                        SD_JSON_BUILD_PAIR_CONDITION(with_cache, "cache", SD_JSON_BUILD_VARIANT(cache)),
+                        SD_JSON_BUILD_PAIR_VARIANT("cache", cache),
                         SD_JSON_BUILD_PAIR_CONDITION(scope->protocol == DNS_PROTOCOL_DNS,
                                                      "dnssec",
                                                      SD_JSON_BUILD_STRING(dnssec_mode_to_string(scope->dnssec_mode))),

src/resolve/resolved-dns-scope.h

@@ -120,7 +120,7 @@ int dns_scope_remove_dnssd_registered_services(DnsScope *scope);
 
 bool dns_scope_is_default_route(DnsScope *scope);
 
-int dns_scope_to_json(DnsScope *scope, bool with_cache, sd_json_variant **ret);
+int dns_scope_dump_cache_to_json(DnsScope *scope, sd_json_variant **ret);
 
 int dns_type_suitable_for_protocol(uint16_t type, DnsProtocol protocol);
 int dns_question_types_suitable_for_protocol(DnsQuestion *q, DnsProtocol protocol);

src/resolve/resolved-manager.c

@@ -2068,10 +2068,39 @@ static int dns_configuration_json_append(
 
         assert(configuration);
 
+        if (dns_servers) {
+                r = sd_json_variant_new_array(&dns_servers_json, NULL, 0);
+                if (r < 0)
+                        return r;
+        }
+
+        if (search_domains) {
+                r = sd_json_variant_new_array(&search_domains_json, NULL, 0);
+                if (r < 0)
+                        return r;
+        }
+
+        if (current_dns_server) {
+                r = dns_server_dump_configuration_to_json(current_dns_server, &current_dns_server_json);
+                if (r < 0)
+                        return r;
+        }
+
+        if (fallback_dns_servers) {
+                r = sd_json_variant_new_array(&fallback_dns_servers_json, NULL, 0);
+                if (r < 0)
+                        return r;
+        }
+
         SET_FOREACH(scope, dns_scopes) {
                 _cleanup_(sd_json_variant_unrefp) sd_json_variant *v = NULL;
 
-                r = dns_scope_to_json(scope, /* with_cache= */ false, &v);
+                r = dns_scope_dump_cache_to_json(scope, &v);
+                if (r < 0)
+                        return r;
+
+                /* The cache is not relevant to the configuration of the scope. */
+                r = sd_json_variant_filter(&v, STRV_MAKE("cache"));
                 if (r < 0)
                         return r;
 
@@ -2083,6 +2112,8 @@ static int dns_configuration_json_append(
         LIST_FOREACH(servers, s, dns_servers) {
                 _cleanup_(sd_json_variant_unrefp) sd_json_variant *v = NULL;
 
+                assert(dns_servers_json);
+
                 r = dns_server_dump_configuration_to_json(s, &v);
                 if (r < 0)
                         return r;
@@ -2095,6 +2126,8 @@ static int dns_configuration_json_append(
         LIST_FOREACH(domains, d, search_domains) {
                 _cleanup_(sd_json_variant_unrefp) sd_json_variant *v = NULL;
 
+                assert(search_domains_json);
+
                 r = dns_search_domain_dump_to_json(d, &v);
                 if (r < 0)
                         return r;
@@ -2107,6 +2140,8 @@ static int dns_configuration_json_append(
         LIST_FOREACH(servers, s, fallback_dns_servers) {
                 _cleanup_(sd_json_variant_unrefp) sd_json_variant *v = NULL;
 
+                assert(fallback_dns_servers_json);
+
                 r = dns_server_dump_configuration_to_json(s, &v);
                 if (r < 0)
                         return r;
@@ -2121,7 +2156,9 @@ static int dns_configuration_json_append(
                         JSON_BUILD_PAIR_STRING_NON_EMPTY("ifname", ifname),
                         SD_JSON_BUILD_PAIR_CONDITION(ifindex > 0, "ifindex", SD_JSON_BUILD_UNSIGNED(ifindex)),
                         JSON_BUILD_PAIR_STRING_NON_EMPTY("delegate", delegate),
-                        JSON_BUILD_PAIR_TRISTATE_NON_NULL("defaultRoute", default_route),
+                        JSON_BUILD_PAIR_CONDITION_BOOLEAN(ifindex > 0 || !!delegate,
+                                                          "defaultRoute",
+                                                          default_route > 0),
                         JSON_BUILD_PAIR_VARIANT_NON_NULL("currentServer", current_dns_server_json),
                         JSON_BUILD_PAIR_VARIANT_NON_NULL("servers", dns_servers_json),
                         JSON_BUILD_PAIR_VARIANT_NON_NULL("fallbackServers", fallback_dns_servers_json),
@@ -2152,7 +2189,7 @@ static int global_dns_configuration_json_append(Manager *m, sd_json_variant **co
                         /* ifname = */ NULL,
                         /* ifindex = */ 0,
                         /* delegate = */ NULL,
-                        /* default_route = */ -1,
+                        /* default_route = */ 0,
                         manager_get_dns_server(m),
                         m->dns_servers,
                         m->fallback_dns_servers,
@@ -2238,7 +2275,7 @@ static int delegate_dns_configuration_json_append(DnsDelegate *d, sd_json_varian
                         /* ifname = */ NULL,
                         /* ifindex = */ 0,
                         d->id,
-                        d->default_route > 0, /* Defaults to false. See dns_scope_is_default_route(). */
+                        d->default_route,
                         dns_delegate_get_dns_server(d),
                         d->dns_servers,
                         /* fallback_dns_servers = */ NULL,

src/resolve/resolved-varlink.c

@@ -1270,7 +1270,7 @@ static int vl_method_dump_cache(sd_varlink *link, sd_json_variant *parameters, s
         LIST_FOREACH(scopes, s, m->dns_scopes) {
                 _cleanup_(sd_json_variant_unrefp) sd_json_variant *j = NULL;
 
-                r = dns_scope_to_json(s, /* with_cache= */ true, &j);
+                r = dns_scope_dump_cache_to_json(s, &j);
                 if (r < 0)
                         return r;
 

src/shared/varlink-io.systemd.Resolve.Monitor.c

@@ -5,10 +5,6 @@
 
 /* We want to reuse several structures from the io.systemd.Resolve interface, namely:
  *
- * - DNSProtocol
- * - DNSOverTLSMode
- * - ResolveSupport
- * - ResolvConfMode
  * - ResourceKey
  * - ResourceRecord
  * - DNSServer
@@ -56,13 +52,13 @@ static SD_VARLINK_DEFINE_STRUCT_TYPE(
 
 static SD_VARLINK_DEFINE_STRUCT_TYPE(
                 ScopeCache,
-                SD_VARLINK_DEFINE_FIELD_BY_TYPE(protocol, DNSProtocol, 0),
+                SD_VARLINK_DEFINE_FIELD(protocol, SD_VARLINK_STRING, 0),
                 SD_VARLINK_DEFINE_FIELD(family, SD_VARLINK_INT, SD_VARLINK_NULLABLE),
                 SD_VARLINK_DEFINE_FIELD(ifindex, SD_VARLINK_INT, SD_VARLINK_NULLABLE),
                 SD_VARLINK_DEFINE_FIELD(ifname, SD_VARLINK_STRING, SD_VARLINK_NULLABLE),
                 SD_VARLINK_DEFINE_FIELD_BY_TYPE(cache, CacheEntry, SD_VARLINK_ARRAY),
                 SD_VARLINK_DEFINE_FIELD(dnssec, SD_VARLINK_STRING, SD_VARLINK_NULLABLE),
-                SD_VARLINK_DEFINE_FIELD_BY_TYPE(dnsOverTLS, DNSOverTLSMode, SD_VARLINK_NULLABLE));
+                SD_VARLINK_DEFINE_FIELD(dnsOverTLS, SD_VARLINK_STRING, SD_VARLINK_NULLABLE));
 
 static SD_VARLINK_DEFINE_METHOD(
                 DumpCache,
@@ -141,10 +137,6 @@ SD_VARLINK_DEFINE_INTERFACE(
                 &vl_method_DumpServerState,
                 &vl_method_DumpStatistics,
                 &vl_method_ResetStatistics,
-                &vl_type_DNSProtocol,
-                &vl_type_DNSOverTLSMode,
-                &vl_type_ResolveSupport,
-                &vl_type_ResolvConfMode,
                 &vl_type_ResourceKey,
                 &vl_type_ResourceRecord,
                 &vl_type_ResourceRecordArray,

src/shared/varlink-io.systemd.Resolve.c

@@ -1,48 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "resolve-util.h"
 #include "varlink-io.systemd.Resolve.h"
 
-SD_VARLINK_DEFINE_ENUM_TYPE(
-                DNSProtocol,
-                SD_VARLINK_FIELD_COMMENT("DNS"),
-                SD_VARLINK_DEFINE_ENUM_VALUE(dns),
-                SD_VARLINK_FIELD_COMMENT("Multicast DNS"),
-                SD_VARLINK_DEFINE_ENUM_VALUE(mdns),
-                SD_VARLINK_FIELD_COMMENT("LLMNR"),
-                SD_VARLINK_DEFINE_ENUM_VALUE(llmnr));
-
-SD_VARLINK_DEFINE_ENUM_TYPE(
-                DNSOverTLSMode,
-                SD_VARLINK_FIELD_COMMENT("DNSOverTLS is disabled."),
-                SD_VARLINK_DEFINE_ENUM_VALUE(no),
-                SD_VARLINK_FIELD_COMMENT("DNSOverTLS is enabled."),
-                SD_VARLINK_DEFINE_ENUM_VALUE(yes),
-                SD_VARLINK_FIELD_COMMENT("Try to use DNSOverTLS, but disabled when the server does not support it."),
-                SD_VARLINK_DEFINE_ENUM_VALUE(opportunistic));
-
-SD_VARLINK_DEFINE_ENUM_TYPE(
-                ResolveSupport,
-                SD_VARLINK_FIELD_COMMENT("The protocol is disabled."),
-                SD_VARLINK_DEFINE_ENUM_VALUE(no),
-                SD_VARLINK_FIELD_COMMENT("The protocol is enabled."),
-                SD_VARLINK_DEFINE_ENUM_VALUE(yes),
-                SD_VARLINK_FIELD_COMMENT("The protocol is used only for resolving."),
-                SD_VARLINK_DEFINE_ENUM_VALUE(resolve));
-
-SD_VARLINK_DEFINE_ENUM_TYPE(
-                ResolvConfMode,
-                SD_VARLINK_FIELD_COMMENT("/etc/resolv.conf is a symbolic link to "PRIVATE_UPLINK_RESOLV_CONF"."),
-                SD_VARLINK_DEFINE_ENUM_VALUE(uplink),
-                SD_VARLINK_FIELD_COMMENT("/etc/resolv.conf is a symbolic link to "PRIVATE_STUB_RESOLV_CONF"."),
-                SD_VARLINK_DEFINE_ENUM_VALUE(stub),
-                SD_VARLINK_FIELD_COMMENT("/etc/resolv.conf is a symbolic link to "PRIVATE_STATIC_RESOLV_CONF"."),
-                SD_VARLINK_DEFINE_ENUM_VALUE(static),
-                SD_VARLINK_FIELD_COMMENT("/etc/resolv.conf does not exist."),
-                SD_VARLINK_DEFINE_ENUM_VALUE(missing),
-                SD_VARLINK_FIELD_COMMENT("/etc/resolv.conf is not managed by systemd-resolved."),
-                SD_VARLINK_DEFINE_ENUM_VALUE(foreign));
-
 SD_VARLINK_DEFINE_STRUCT_TYPE(
                 ResourceKey,
                 SD_VARLINK_FIELD_COMMENT("The RR class, almost always IN, i.e 0x01. If unspecified defaults to IN."),
@@ -240,7 +199,7 @@ SD_VARLINK_DEFINE_STRUCT_TYPE(
 SD_VARLINK_DEFINE_STRUCT_TYPE(
                 DNSScope,
                 SD_VARLINK_FIELD_COMMENT("Protocol associated with this scope."),
-                SD_VARLINK_DEFINE_FIELD_BY_TYPE(protocol, DNSProtocol, 0),
+                SD_VARLINK_DEFINE_FIELD(protocol, SD_VARLINK_STRING, 0),
                 SD_VARLINK_FIELD_COMMENT("Address family associated with this scope."),
                 SD_VARLINK_DEFINE_FIELD(family, SD_VARLINK_INT, SD_VARLINK_NULLABLE),
                 SD_VARLINK_FIELD_COMMENT("Interface index associated with this scope."),
@@ -250,7 +209,7 @@ SD_VARLINK_DEFINE_STRUCT_TYPE(
                 SD_VARLINK_FIELD_COMMENT("DNSSEC mode associated with this scope."),
                 SD_VARLINK_DEFINE_FIELD(dnssec, SD_VARLINK_STRING, SD_VARLINK_NULLABLE),
                 SD_VARLINK_FIELD_COMMENT("DNSOverTLS mode associated with this scope."),
-                SD_VARLINK_DEFINE_FIELD_BY_TYPE(dnsOverTLS, DNSOverTLSMode, SD_VARLINK_NULLABLE));
+                SD_VARLINK_DEFINE_FIELD(dnsOverTLS, SD_VARLINK_STRING, SD_VARLINK_NULLABLE));
 
 SD_VARLINK_DEFINE_STRUCT_TYPE(
                 DNSConfiguration,
@@ -275,14 +234,13 @@ SD_VARLINK_DEFINE_STRUCT_TYPE(
                 SD_VARLINK_FIELD_COMMENT("DNSSEC mode."),
                 SD_VARLINK_DEFINE_FIELD(dnssec, SD_VARLINK_STRING, SD_VARLINK_NULLABLE),
                 SD_VARLINK_FIELD_COMMENT("DNSOverTLS mode."),
-                SD_VARLINK_DEFINE_FIELD_BY_TYPE(dnsOverTLS, DNSOverTLSMode, SD_VARLINK_NULLABLE),
+                SD_VARLINK_DEFINE_FIELD(dnsOverTLS, SD_VARLINK_STRING, SD_VARLINK_NULLABLE),
                 SD_VARLINK_FIELD_COMMENT("LLMNR support."),
-                //SD_VARLINK_DEFINE_FIELD_BY_TYPE(llmnr, ResolveSupport, SD_VARLINK_NULLABLE),
                 SD_VARLINK_DEFINE_FIELD(llmnr, SD_VARLINK_STRING, SD_VARLINK_NULLABLE),
                 SD_VARLINK_FIELD_COMMENT("mDNS support."),
-                SD_VARLINK_DEFINE_FIELD_BY_TYPE(mDNS, ResolveSupport, SD_VARLINK_NULLABLE),
+                SD_VARLINK_DEFINE_FIELD(mDNS, SD_VARLINK_STRING, SD_VARLINK_NULLABLE),
                 SD_VARLINK_FIELD_COMMENT("resolv.conf mode, set for global configuration only."),
-                SD_VARLINK_DEFINE_FIELD_BY_TYPE(resolvConfMode, ResolvConfMode, SD_VARLINK_NULLABLE),
+                SD_VARLINK_DEFINE_FIELD(resolvConfMode, SD_VARLINK_STRING, SD_VARLINK_NULLABLE),
                 SD_VARLINK_FIELD_COMMENT("Array of current DNS scopes."),
                 SD_VARLINK_DEFINE_FIELD_BY_TYPE(scopes, DNSScope, SD_VARLINK_ARRAY|SD_VARLINK_NULLABLE));
 
@@ -359,14 +317,6 @@ SD_VARLINK_DEFINE_INTERFACE(
                 &vl_method_BrowseServices,
                 SD_VARLINK_SYMBOL_COMMENT("Current global and per-link DNS configurations."),
                 &vl_method_DumpDNSConfiguration,
-                SD_VARLINK_SYMBOL_COMMENT("The type of protocol."),
-                &vl_type_DNSProtocol,
-                SD_VARLINK_SYMBOL_COMMENT("The mode of DNSOverTLS."),
-                &vl_type_DNSOverTLSMode,
-                SD_VARLINK_SYMBOL_COMMENT("Whether the protocol is enabled."),
-                &vl_type_ResolveSupport,
-                SD_VARLINK_SYMBOL_COMMENT("The management mode of /etc/resolve.conf file."),
-                &vl_type_ResolvConfMode,
                 SD_VARLINK_SYMBOL_COMMENT("Encapsulates a resolved address."),
                 &vl_type_ResolvedAddress,
                 SD_VARLINK_SYMBOL_COMMENT("Encapsulates a resolved host name."),

src/shared/varlink-io.systemd.Resolve.h

@@ -3,10 +3,6 @@
 
 #include "sd-varlink-idl.h"
 
-extern const sd_varlink_symbol vl_type_DNSProtocol;
-extern const sd_varlink_symbol vl_type_DNSOverTLSMode;
-extern const sd_varlink_symbol vl_type_ResolveSupport;
-extern const sd_varlink_symbol vl_type_ResolvConfMode;
 extern const sd_varlink_symbol vl_type_ResourceKey;
 extern const sd_varlink_symbol vl_type_ResourceRecord;
 extern const sd_varlink_symbol vl_type_DNSServer;

src/test/test-varlink-idl.c

@@ -13,7 +13,6 @@
 #include "json-util.h"
 #include "network-util.h"
 #include "pretty-print.h"
-#include "resolve-util.h"
 #include "tests.h"
 #include "varlink-idl-util.h"
 #include "varlink-io.systemd.h"
@@ -513,18 +512,13 @@ static void test_enum_to_string_name(const char *n, const sd_varlink_symbol *sym
 TEST(enums_idl) {
         TEST_IDL_ENUM(BootEntryType, boot_entry_type, vl_type_BootEntryType);
         TEST_IDL_ENUM_TO_STRING(BootEntrySource, boot_entry_source, vl_type_BootEntrySource);
-
         TEST_IDL_ENUM(PartitionDesignator, partition_designator, vl_type_PartitionDesignator);
-
         TEST_IDL_ENUM(LinkAddressState, link_address_state, vl_type_LinkAddressState);
         TEST_IDL_ENUM_TO_STRING(LinkAddressState, link_address_state, vl_type_LinkAddressState);
         TEST_IDL_ENUM(LinkOnlineState, link_online_state, vl_type_LinkOnlineState);
         TEST_IDL_ENUM_TO_STRING(LinkOnlineState, link_online_state, vl_type_LinkOnlineState);
         TEST_IDL_ENUM(AddressFamily, link_required_address_family, vl_type_LinkRequiredAddressFamily);
         TEST_IDL_ENUM_TO_STRING(AddressFamily, link_required_address_family, vl_type_LinkRequiredAddressFamily);
-
-        TEST_IDL_ENUM(DnsOverTlsMode, dns_over_tls_mode, vl_type_DNSOverTLSMode);
-        TEST_IDL_ENUM(ResolveSupport, resolve_support, vl_type_ResolveSupport);
 }
 
 DEFINE_TEST_MAIN(LOG_DEBUG);

test/units/TEST-04-JOURNAL.reload.sh

@@ -10,10 +10,8 @@ set -o pipefail
 MACHINE_ID="$(</etc/machine-id)"
 SYSLOG_ID="$(systemd-id128 new)"
 
-SERVICE_COUNTER=0
-
 write_to_journal() {
-    local service="test-$((SERVICE_COUNTER++))-${RANDOM}.service"
+    local service="test-${RANDOM}.service"
 
     systemd-run -q --wait -u "$service" bash -c "echo service=$service invocation=\$INVOCATION_ID; journalctl --sync"
     echo "$service"

test/units/TEST-13-NSPAWN.nspawn.sh

@@ -90,50 +90,45 @@ testcase_sanity() {
     # --template=
     root="$(mktemp -u -d /var/lib/machines/TEST-13-NSPAWN.sanity.XXX)"
     coverage_create_nspawn_dropin "$root"
-    (! systemd-nspawn --register=no --directory="$root" bash -xec 'echo hello')
+    (! systemd-nspawn --directory="$root" bash -xec 'echo hello')
     # Initialize $root from $template (the $root directory must not exist, hence
     # the `mktemp -u` above)
-    systemd-nspawn --register=no --directory="$root" --template="$template" bash -xec 'echo hello'
+    systemd-nspawn --directory="$root" --template="$template" bash -xec 'echo hello'
-    systemd-nspawn --register=no --directory="$root" bash -xec 'echo hello; touch /initialized'
+    systemd-nspawn --directory="$root" bash -xec 'echo hello; touch /initialized'
     test -e "$root/initialized"
     # Check if the $root doesn't get re-initialized once it's not empty
-    systemd-nspawn --register=no --directory="$root" --template="$template" bash -xec 'echo hello'
+    systemd-nspawn --directory="$root" --template="$template" bash -xec 'echo hello'
     test -e "$root/initialized"
 
-    systemd-nspawn --register=no --directory="$root" --ephemeral bash -xec 'touch /ephemeral'
+    systemd-nspawn --directory="$root" --ephemeral bash -xec 'touch /ephemeral'
     test ! -e "$root/ephemeral"
-    (! systemd-nspawn --register=no \
+    (! systemd-nspawn --directory="$root" \
-                      --directory="$root" \
                       --read-only \
                       bash -xec 'touch /nope')
     test ! -e "$root/nope"
-    systemd-nspawn --register=no --image="$image" bash -xec 'echo hello'
+    systemd-nspawn --image="$image" bash -xec 'echo hello'
 
     # --volatile=
     touch "$root/usr/has-usr"
     # volatile(=yes): rootfs is tmpfs, /usr/ from the OS tree is mounted read only
-    systemd-nspawn --register=no \
+    systemd-nspawn --directory="$root"\
-                   --directory="$root" \
                    --volatile \
                    bash -xec 'test -e /usr/has-usr; touch /usr/read-only && exit 1; touch /nope'
     test ! -e "$root/nope"
     test ! -e "$root/usr/read-only"
-    systemd-nspawn --register=no \
+    systemd-nspawn --directory="$root"\
-                   --directory="$root" \
                    --volatile=yes \
                    bash -xec 'test -e /usr/has-usr; touch /usr/read-only && exit 1; touch /nope'
     test ! -e "$root/nope"
     test ! -e "$root/usr/read-only"
     # volatile=state: rootfs is read-only, /var/ is tmpfs
-    systemd-nspawn --register=no \
+    systemd-nspawn --directory="$root" \
-                   --directory="$root" \
                    --volatile=state \
                    bash -xec 'test -e /usr/has-usr; mountpoint /var; touch /read-only && exit 1; touch /var/nope'
     test ! -e "$root/read-only"
     test ! -e "$root/var/nope"
     # volatile=overlay: tmpfs overlay is mounted over rootfs
-    systemd-nspawn --register=no \
+    systemd-nspawn --directory="$root" \
-                   --directory="$root" \
                    --volatile=overlay \
                    bash -xec 'test -e /usr/has-usr; touch /nope; touch /var/also-nope; touch /usr/nope-too'
     test ! -e "$root/nope"
@@ -143,31 +138,27 @@ testcase_sanity() {
     # --volatile= with -U
     touch "$root/usr/has-usr"
     # volatile(=yes): rootfs is tmpfs, /usr/ from the OS tree is mounted read only
-    systemd-nspawn --register=no \
+    systemd-nspawn --directory="$root"\
-                   --directory="$root" \
                    --volatile \
                    -U \
                    bash -xec 'test -e /usr/has-usr; touch /usr/read-only && exit 1; touch /nope'
     test ! -e "$root/nope"
     test ! -e "$root/usr/read-only"
-    systemd-nspawn --register=no \
+    systemd-nspawn --directory="$root"\
-                   --directory="$root" \
                    --volatile=yes \
                    -U \
                    bash -xec 'test -e /usr/has-usr; touch /usr/read-only && exit 1; touch /nope'
     test ! -e "$root/nope"
     test ! -e "$root/usr/read-only"
     # volatile=state: rootfs is read-only, /var/ is tmpfs
-    systemd-nspawn --register=no \
+    systemd-nspawn --directory="$root" \
-                   --directory="$root" \
                    --volatile=state \
                    -U \
                    bash -xec 'test -e /usr/has-usr; mountpoint /var; touch /read-only && exit 1; touch /var/nope'
     test ! -e "$root/read-only"
     test ! -e "$root/var/nope"
     # volatile=overlay: tmpfs overlay is mounted over rootfs
-    systemd-nspawn --register=no \
+    systemd-nspawn --directory="$root" \
-                   --directory="$root" \
                    --volatile=overlay \
                    -U \
                    bash -xec 'test -e /usr/has-usr; touch /nope; touch /var/also-nope; touch /usr/nope-too'
@@ -176,16 +167,13 @@ testcase_sanity() {
     test ! -e "$root/usr/nope-too"
 
     # --machine=, --hostname=
-    systemd-nspawn --register=no \
+    systemd-nspawn --directory="$root" \
-                   --directory="$root" \
                    --machine="foo-bar.baz" \
                    bash -xec '[[ $(hostname) == foo-bar.baz ]]'
-    systemd-nspawn --register=no \
+    systemd-nspawn --directory="$root" \
-                   --directory="$root" \
                    --hostname="hello.world.tld" \
                    bash -xec '[[ $(hostname) == hello.world.tld ]]'
-    systemd-nspawn --register=no \
+    systemd-nspawn --directory="$root" \
-                   --directory="$root" \
                    --machine="foo-bar.baz" \
                    --hostname="hello.world.tld" \
                    bash -xec '[[ $(hostname) == hello.world.tld ]]'
@@ -193,14 +181,13 @@ testcase_sanity() {
     # --uuid=
     rm -f "$root/etc/machine-id"
     uuid="deadbeef-dead-dead-beef-000000000000"
-    systemd-nspawn --register=no \
+    systemd-nspawn --directory="$root" \
-                   --directory="$root" \
                    --uuid="$uuid" \
                    bash -xec "[[ \$container_uuid == $uuid ]]"
 
     # --as-pid2
-    systemd-nspawn --register=no --directory="$root" bash -xec '[[ $$ -eq 1 ]]'
+    systemd-nspawn --directory="$root" bash -xec '[[ $$ -eq 1 ]]'
-    systemd-nspawn --register=no --directory="$root" --as-pid2 bash -xec '[[ $$ -eq 2 ]]'
+    systemd-nspawn --directory="$root" --as-pid2 bash -xec '[[ $$ -eq 2 ]]'
 
     # --user=
     # "Fake" getent passwd's bare minimum, so we don't have to pull it in
@@ -221,32 +208,28 @@ EOF
     # bash will end up loading libnss_systemd.so which breaks when libnss_systemd.so is built with sanitizers
     # as bash isn't invoked with the necessary environment variables for that.
     useradd --root="$root" --uid 1000 --user-group --create-home testuser
-    systemd-nspawn --register=no --directory="$root" bash -xec '[[ $USER == root ]]'
+    systemd-nspawn --directory="$root" bash -xec '[[ $USER == root ]]'
-    systemd-nspawn --register=no --directory="$root" --user=testuser bash -xec '[[ $USER == testuser ]]'
+    systemd-nspawn --directory="$root" --user=testuser bash -xec '[[ $USER == testuser ]]'
 
     # --settings= + .nspawn files
     mkdir -p /run/systemd/nspawn/
     uuid="deadbeef-dead-dead-beef-000000000000"
     echo -ne "[Exec]\nMachineID=deadbeef-dead-dead-beef-111111111111" >/run/systemd/nspawn/foo-bar.nspawn
-    systemd-nspawn --register=no \
+    systemd-nspawn --directory="$root" \
-                   --directory="$root" \
                    --machine=foo-bar \
                    --settings=yes \
                    bash -xec '[[ $container_uuid == deadbeef-dead-dead-beef-111111111111 ]]'
-    systemd-nspawn --register=no \
+    systemd-nspawn --directory="$root" \
-                   --directory="$root" \
                    --machine=foo-bar \
                    --uuid="$uuid" \
                    --settings=yes \
                    bash -xec "[[ \$container_uuid == $uuid ]]"
-    systemd-nspawn --register=no \
+    systemd-nspawn --directory="$root" \
-                   --directory="$root" \
                    --machine=foo-bar \
                    --uuid="$uuid" \
                    --settings=override \
                    bash -xec '[[ $container_uuid == deadbeef-dead-dead-beef-111111111111 ]]'
-    systemd-nspawn --register=no \
+    systemd-nspawn --directory="$root" \
-                   --directory="$root" \
                    --machine=foo-bar \
                    --uuid="$uuid" \
                    --settings=trusted \
@@ -257,8 +240,7 @@ EOF
     touch "$tmpdir/1/one" "$tmpdir/2/two" "$tmpdir/3/three"
     touch "$tmpdir/foo"
     # --bind=
-    systemd-nspawn --register=no \
+    systemd-nspawn --directory="$root" \
-                   --directory="$root" \
                    ${COVERAGE_BUILD_DIR:+--bind="$COVERAGE_BUILD_DIR"} \
                    --bind="$tmpdir:/foo" \
                    --bind="$tmpdir:/also-foo:noidmap,norbind" \
@@ -266,8 +248,7 @@ EOF
     # --bind= recursive
     rm -f "$tmpdir/bar"
     mount --bind "$tmpdir/1" "$tmpdir/2"
-    systemd-nspawn --register=no \
+    systemd-nspawn --directory="$root" \
-                   --directory="$root" \
                    ${COVERAGE_BUILD_DIR:+--bind="$COVERAGE_BUILD_DIR"} \
                    --bind="$tmpdir:/foo" \
                    --bind="$tmpdir:/also-foo:noidmap,norbind" \
@@ -275,52 +256,46 @@ EOF
     umount "$tmpdir/2"
     test -e "$tmpdir/bar"
     # --bind-ro=
-    systemd-nspawn --register=no \
+    systemd-nspawn --directory="$root" \
-                   --directory="$root" \
                    --bind-ro="$tmpdir:/foo" \
                    --bind-ro="$tmpdir:/bar:noidmap,norbind" \
                    bash -xec 'test -e /foo/foo; touch /foo/baz && exit 1; touch /bar && exit 1; true'
     # --inaccessible=
-    systemd-nspawn --register=no \
+    systemd-nspawn --directory="$root" \
-                   --directory="$root" \
                    --inaccessible=/var \
                    bash -xec 'touch /var/foo && exit 1; true'
     # --tmpfs=
-    systemd-nspawn --register=no \
+    systemd-nspawn --directory="$root" \
-                   --directory="$root" \
                    --tmpfs=/var:rw,nosuid,noexec \
                    bash -xec 'touch /var/nope'
     test ! -e "$root/var/nope"
     # --overlay=
-    systemd-nspawn --register=no \
+    systemd-nspawn --directory="$root" \
-                   --directory="$root" \
                    --overlay="$tmpdir/1:$tmpdir/2:$tmpdir/3:/var" \
                    bash -xec 'test -e /var/one; test -e /var/two; test -e /var/three; touch /var/foo'
     test -e "$tmpdir/3/foo"
     # --overlay-ro=
-    systemd-nspawn --register=no \
+    systemd-nspawn --directory="$root" \
-                   --directory="$root" \
                    --overlay-ro="$tmpdir/1:$tmpdir/2:$tmpdir/3:/var" \
                    bash -xec 'test -e /var/one; test -e /var/two; test -e /var/three; touch /var/nope && exit 1; true'
     test ! -e "$tmpdir/3/nope"
     rm -fr "$tmpdir"
 
     # --port (sanity only)
-    systemd-nspawn --register=no --network-veth --directory="$root" --port=80 --port=90 true
+    systemd-nspawn --network-veth --directory="$root" --port=80 --port=90 true
-    systemd-nspawn --register=no --network-veth --directory="$root" --port=80:8080 true
+    systemd-nspawn --network-veth --directory="$root" --port=80:8080 true
-    systemd-nspawn --register=no --network-veth --directory="$root" --port=tcp:80 true
+    systemd-nspawn --network-veth --directory="$root" --port=tcp:80 true
-    systemd-nspawn --register=no --network-veth --directory="$root" --port=tcp:80:8080 true
+    systemd-nspawn --network-veth --directory="$root" --port=tcp:80:8080 true
-    systemd-nspawn --register=no --network-veth --directory="$root" --port=udp:80 true
+    systemd-nspawn --network-veth --directory="$root" --port=udp:80 true
-    systemd-nspawn --register=no --network-veth --directory="$root" --port=udp:80:8080 --port=tcp:80:8080 true
+    systemd-nspawn --network-veth --directory="$root" --port=udp:80:8080 --port=tcp:80:8080 true
-    (! systemd-nspawn --register=no --network-veth --directory="$root" --port= true)
+    (! systemd-nspawn --network-veth --directory="$root" --port= true)
-    (! systemd-nspawn --register=no --network-veth --directory="$root" --port=-1 true)
+    (! systemd-nspawn --network-veth --directory="$root" --port=-1 true)
-    (! systemd-nspawn --register=no --network-veth --directory="$root" --port=: true)
+    (! systemd-nspawn --network-veth --directory="$root" --port=: true)
-    (! systemd-nspawn --register=no --network-veth --directory="$root" --port=icmp:80:8080 true)
+    (! systemd-nspawn --network-veth --directory="$root" --port=icmp:80:8080 true)
-    (! systemd-nspawn --register=no --network-veth --directory="$root" --port=tcp::8080 true)
+    (! systemd-nspawn --network-veth --directory="$root" --port=tcp::8080 true)
-    (! systemd-nspawn --register=no --network-veth --directory="$root" --port=8080: true)
+    (! systemd-nspawn --network-veth --directory="$root" --port=8080: true)
     # Exercise adding/removing ports from an interface
-    systemd-nspawn --register=no \
+    systemd-nspawn --directory="$root" \
-                   --directory="$root" \
                    --network-veth \
                    --port=6667 \
                    --port=80:8080 \
@@ -330,14 +305,12 @@ EOF
 
     # --load-credential=, --set-credential=
     echo "foo bar" >/tmp/cred.path
-    systemd-nspawn --register=no \
+    systemd-nspawn --directory="$root" \
-                   --directory="$root" \
                    --load-credential=cred.path:/tmp/cred.path \
                    --set-credential="cred.set:hello world" \
                    bash -xec '[[ "$(</run/host/credentials/cred.path)" == "foo bar" ]]; [[ "$(</run/host/credentials/cred.set)" == "hello world" ]]'
     # Combine with --user to ensure creds are still readable
-    systemd-nspawn --register=no \
+    systemd-nspawn --directory="$root" \
-                   --directory="$root" \
                    --user=testuser \
                    --no-new-privileges=yes \
                    --load-credential=cred.path:/tmp/cred.path \
@@ -346,9 +319,9 @@ EOF
     rm -f /tmp/cred.path
 
     # Assorted tests
-    systemd-nspawn --register=no --directory="$root" --suppress-sync=yes bash -xec 'echo hello'
+    systemd-nspawn --directory="$root" --suppress-sync=yes bash -xec 'echo hello'
     systemd-nspawn --capability=help
-    systemd-nspawn --register=no --directory="$root" --capability=all bash -xec 'echo hello'
+    systemd-nspawn --directory="$root" --capability=all bash -xec 'echo hello'
     systemd-nspawn --resolv-conf=help
     systemd-nspawn --timezone=help
 
@@ -1338,7 +1311,7 @@ testcase_fuse() {
     #    "cat: -: Operation not permitted"                   # pass the test; opened but not read
     #    "bash: line 1: /dev/fuse: Operation not permitted"  # fail the test; could not open
     #    ""                                                  # fail the test; reading worked
-    [[ "$(systemd-nspawn --register=no --pipe --directory="$root" \
+    [[ "$(systemd-nspawn --pipe --directory="$root" \
               bash -c 'cat <>/dev/fuse' 2>&1)" == 'cat: -: Operation not permitted' ]]
 
     rm -fr "$root"
@@ -1378,7 +1351,7 @@ testcase_unpriv_fuse() {
 }
 
 test_tun() {
-    systemd-nspawn --register=no "$@" bash -xec '[[ -c /dev/net/tun ]]; [[ "$(stat /dev/net/tun --format=%u)" == 0 ]]; [[ "$(stat /dev/net/tun --format=%g)" == 0 ]]'
+    systemd-nspawn "$@" bash -xec '[[ -c /dev/net/tun ]]; [[ "$(stat /dev/net/tun --format=%u)" == 0 ]]; [[ "$(stat /dev/net/tun --format=%g)" == 0 ]]'
 
     # check if the owner of the host device is unchanged, see issue #34243.
     [[ "$(stat /dev/net/tun --format=%u)" == 0 ]]
@@ -1387,7 +1360,7 @@ test_tun() {
     # Without DeviceAllow= for /dev/net/tun, see issue #35116.
     systemd-run \
         --wait -p Environment=SYSTEMD_LOG_LEVEL=debug -p DevicePolicy=closed -p DeviceAllow="char-pts rw" \
-        systemd-nspawn --register=no "$@" bash -xec '[[ ! -e /dev/net/tun ]]'
+        systemd-nspawn "$@" bash -xec '[[ ! -e /dev/net/tun ]]'
 
     [[ "$(stat /dev/net/tun --format=%u)" == 0 ]]
     [[ "$(stat /dev/net/tun --format=%g)" == 0 ]]
@@ -1467,7 +1440,7 @@ testcase_link_journal_host() {
 
     for i in no yes pick; do
         systemd-nspawn \
-            --register=no --directory="$root" --private-users="$i" --link-journal=host \
+            --directory="$root" --private-users="$i" --link-journal=host \
             bash -xec 'p="/var/log/journal/$(cat /etc/machine-id)"; mountpoint "$p"; [[ "$(stat "$p" --format=%u)" == 0 ]]; touch "$p/hoge"'
 
         [[ "$(stat "${hoge}/hoge" --format=%u)" == 0 ]]