From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 04 Mar 2026 13:35:02 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vxlRN-007z0o-36 for lore@lore.pengutronix.de; Wed, 04 Mar 2026 13:35:02 +0100 Received: from [127.0.0.1] (helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vxlRO-0006kV-Mp; Wed, 04 Mar 2026 13:35:02 +0100 Received: from mail-lj1-x230.google.com ([2a00:1450:4864:20::230]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1vxlRF-0006kL-Mb for ptxdist@pengutronix.de; Wed, 04 Mar 2026 13:34:54 +0100 Received: by mail-lj1-x230.google.com with SMTP id 38308e7fff4ca-38a26b4d830so25258681fa.2 for ; Wed, 04 Mar 2026 04:34:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772627693; x=1773232493; darn=pengutronix.de; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=K7i/7WZDsR2/vO9R8rZWGSMIj6XQ3qiTcz2zolJfNx8=; b=GcKpMQOxC7f5zk0EN48w5J/KAq/JVskla0waNVZU0Mw8eykuUTcOKkUwSkfeChLfuS EmmxA4EXK3mZV9iiZtXj1Ak1BERYcuTUGv8gRLAre3dxyJicikvD4aZv9MDDEGwCeOuf peN65X/22y7ob3pcv9mDjoEZZrwoOpcpXi23xUQqfIocBzE+vzsgaE4kJAihL+PcL3GG 3nkO1JYcHj3pBE96xSltUXcJLAnQz9o9sKbUSh+7YSutgp9de1Hge2vozC0UQHy5fu6E 9I9ks4cGifj16Ox/T3ia1w7Z6FBKUaIYc0Ilcj7Ac9Q4ckBIoF6IOq/eNw9SUwl87LZz Ob0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772627693; x=1773232493; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=K7i/7WZDsR2/vO9R8rZWGSMIj6XQ3qiTcz2zolJfNx8=; b=vMcZfNSfYnRA7HSmDvj1fyhUovz5/f11HWy1BYE8CD3BK5hxoPN7Da+FNGTjDes/fW QR83g4cD0t8eIl8zC686g+uAZohpDLvMZiagnlS302+weq5/Kj9O6Yh7U5zaaTGz4kJS XvG2py8PJJGHiDPjoh3w7rjuFF5SyDPLArStvtPMHSPp7pK2xeZ2LLjXBwCV8fCdc8NV 3lAuz9GwG2RDVxp47fxkyZCE0LJolJ41F8jqG2BmpwFNu+0t+f/7var5n7VyCVxyIJo+ WXM+2CemNvp5nltUynzxM5/FT+jSAawq7EmGWzmW7OazkWcuSPaCY91CANzUPuUAs0Ag W6CQ== X-Gm-Message-State: AOJu0YyVhooReX+ftFjeXnr+r1E6byxeLI8hOw1ru/IpKJQf7YvzSIoh rZDuVIFz1JJ2yz4TKvFDG4J/CIp+ceUbgaX+M+dfCRwbx+LMPkYU0HJzc4h6vw== X-Gm-Gg: ATEYQzyUb2llz+ub6HM7j++Q3cq9QSwy6qXwyq0UpLnw+In9H93E/v58Z0TO5nbrcdD unQAnhKbhfOCg4sunTOOVAPwqjZJEAbTHOX7SaG4z5mdu7vVHH0cS41m+9JkkXrRmXnzPnfG6sH CnDNc80mzaKCTyyJJdkMrrpunntDR/s86w66qviGSMF3i+aT1IyXEEkwqlqHidXPIli/nAf2SV9 V2gkB1d2+eGjaAaPzVQ07ENtPtWSdpPy8seOs3Cr7QZqC45Nd5Amcft5sgQqMcESRq3LlVL6UtM soK3jWTbFCnE77at7MAATC9nlTNuULRO3JuLJ5uFtoqKxnx2qCzdtFDPWTHWR+WoLTxet0wY+zr HuhKOguMGPTXgdkLGTtXloGVpsomighbaOF4oXbpJYwbvJfk6U9I5zMhZkXhDIQsp/9ORmeQh1A TgGcTADAaHwNudi2J69IYlqgdDODA= X-Received: by 2002:a05:651c:987:b0:383:5c1b:4968 with SMTP id 38308e7fff4ca-38a2c5646fdmr13904971fa.3.1772627692325; Wed, 04 Mar 2026 04:34:52 -0800 (PST) Received: from laped.lan ([185.181.22.18]) by smtp.googlemail.com with ESMTPSA id 2adb3069b0e04-5a12c9a642fsm346675e87.41.2026.03.04.04.34.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2026 04:34:51 -0800 (PST) From: Lars Alex Pedersen To: ptxdist@pengutronix.de Date: Wed, 4 Mar 2026 13:34:34 +0100 Message-ID: <20260304123435.1730190-1-lapeddk@gmail.com> X-Mailer: git-send-email 2.53.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.2 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH v2 1/2] systemd: Add separate option for systemd resolved X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Lars Alex Pedersen Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Split systemd-resolved from existing SYSTEMD_NETWORK option, so NetworkManager can be used together with systemd-resolved, but without systemd-networkd. Signed-off-by: Lars Alex Pedersen --- v2: Add missing systemd.in and rootfs.make updates to patch rules/systemd.in | 5 +++++ rules/systemd.make | 28 +++++++++++++++------------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/rules/systemd.in b/rules/systemd.in index a39397f69..cfe4d40b5 100644 --- a/rules/systemd.in +++ b/rules/systemd.in @@ -122,6 +122,11 @@ config SYSTEMD_NETWORK select SYSTEMD_DBUS_SERVICES prompt "network configuration with systemd" +config SYSTEMD_RESOLVED + bool + select SYSTEMD_DBUS_SERVICES + prompt "network name resolution with systemd" + config SYSTEMD_OPENSSL bool prompt "openssl support" diff --git a/rules/systemd.make b/rules/systemd.make index e752d194e..f18084f8f 100644 --- a/rules/systemd.make +++ b/rules/systemd.make @@ -150,7 +150,7 @@ SYSTEMD_CONF_OPT := \ -Dnsresourced=false \ -Dnss-myhostname=true \ -Dnss-mymachines=$(call ptx/endis,PTXCONF_SYSTEMD_NSPAWN)d \ - -Dnss-resolve=$(call ptx/endis,PTXCONF_SYSTEMD_NETWORK)d \ + -Dnss-resolve=$(call ptx/endis,PTXCONF_SYSTEMD_RESOLVED)d \ -Dnss-systemd=true \ -Dntp-servers= \ -Dok-color=green \ @@ -172,7 +172,7 @@ SYSTEMD_CONF_OPT := \ -Drandomseed=$(call ptx/falsetrue,PTXCONF_SYSTEMD_DISABLE_RANDOM_SEED) \ -Dremote=$(call ptx/endis,PTXCONF_SYSTEMD_JOURNAL_REMOTE)d \ -Drepart=$(call ptx/endis,PTXCONF_SYSTEMD_REPART)d \ - -Dresolve=$(call ptx/truefalse,PTXCONF_SYSTEMD_NETWORK) \ + -Dresolve=$(call ptx/truefalse,PTXCONF_SYSTEMD_RESOLVED) \ -Drfkill=false \ -Dseccomp=$(call ptx/endis,PTXCONF_SYSTEMD_SECCOMP)d \ -Dselinux=$(call ptx/endis,PTXCONF_GLOBAL_SELINUX)d \ @@ -280,7 +280,7 @@ SYSTEMD_HELPER := \ $(call ptx/ifdef, PTXCONF_SYSTEMD_DISABLE_RANDOM_SEED,,systemd-random-seed) \ systemd-remount-fs \ systemd-reply-password \ - $(call ptx/ifdef, PTXCONF_SYSTEMD_NETWORK,systemd-resolved) \ + $(call ptx/ifdef, PTXCONF_SYSTEMD_RESOLVED,systemd-resolved) \ systemd-shutdown \ systemd-sleep \ systemd-socket-proxyd \ @@ -483,23 +483,13 @@ endif ifdef PTXCONF_SYSTEMD_NETWORK @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/networkctl) - @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/resolvectl) - @$(call install_link, systemd, resolvectl, /usr/bin/systemd-resolve) - @$(call install_link, systemd, ../bin/resolvectl, /usr/sbin/resolvconf) @$(call install_copy, systemd, 0, 0, 0755, -, /usr/lib/systemd/systemd-network-generator) - @$(call install_lib, systemd, 0, 0, 0644, libnss_resolve) - @$(call install_copy, systemd, 0, 0, 0644, -, /usr/lib/systemd/resolv.conf) - @$(call install_alternative, systemd, 0, 0, 0644, \ - /etc/systemd/resolved.conf) - @$(call install_link, systemd, ../systemd-resolved.service, \ - /usr/lib/systemd/system/multi-user.target.wants/systemd-resolved.service) @$(call install_link, systemd, ../systemd-networkd.service, \ /usr/lib/systemd/system/multi-user.target.wants/systemd-networkd.service) @$(call install_link, systemd, ../systemd-networkd.socket, \ /usr/lib/systemd/system/sockets.target.wants/systemd-networkd.socket) @$(call install_link, systemd, ../systemd-networkd-wait-online.service, \ /usr/lib/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service) - @$(call install_tree, systemd, 0, 0, -, /usr/lib/systemd/network) @$(call install_alternative_tree, systemd, 0, 0, /usr/lib/systemd/network) else @@ -507,6 +497,18 @@ else /usr/lib/systemd/network/99-default.link) endif +ifdef PTXCONF_SYSTEMD_RESOLVED + @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/resolvectl) + @$(call install_link, systemd, resolvectl, /usr/bin/systemd-resolve) + @$(call install_link, systemd, ../bin/resolvectl, /usr/sbin/resolvconf) + @$(call install_lib, systemd, 0, 0, 0644, libnss_resolve) + @$(call install_copy, systemd, 0, 0, 0644, -, /usr/lib/systemd/resolv.conf) + @$(call install_alternative, systemd, 0, 0, 0644, \ + /etc/systemd/resolved.conf) + @$(call install_link, systemd, ../systemd-resolved.service, \ + /usr/lib/systemd/system/multi-user.target.wants/systemd-resolved.service) +endif + ifdef PTXCONF_SYSTEMD_POLKIT @$(call install_tree, systemd, 0, 0, -, /usr/share/polkit-1) endif base-commit: 938919627b16d7e2a9558ce1316fb4e42245479c -- 2.53.0