From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 09 Mar 2026 08:22:54 +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 1vzUx3-009fbn-1B for lore@lore.pengutronix.de; Mon, 09 Mar 2026 08:22:54 +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 1vzUx3-0003n8-QN; Mon, 09 Mar 2026 08:22:53 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1vzUwd-0002Ca-90; Mon, 09 Mar 2026 08:22:27 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vzUwb-004Uc0-2L; Mon, 09 Mar 2026 08:22:27 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.98.2) (envelope-from ) id 1vzUwd-0000000H9a5-06yI; Mon, 09 Mar 2026 08:22:27 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Mon, 9 Mar 2026 08:22:26 +0100 Message-ID: <20260309072227.4088398-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260304123435.1730190-1-lapeddk@gmail.com> References: <20260304123435.1730190-1-lapeddk@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] 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 Thanks, applied as 3740b9ea128d06c909854d0b543090c9dc2e4218. Michael [sent from post-receive hook] On Mon, 09 Mar 2026 08:22:26 +0100, Lars Alex Pedersen wrote: > 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 > Message-Id: <20260304123435.1730190-1-lapeddk@gmail.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/systemd.in b/rules/systemd.in > index a39397f69819..cfe4d40b53dc 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 e752d194e751..f18084f8f1ef 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