From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Lars Alex Pedersen <lapeddk@gmail.com>
Subject: Re: [ptxdist] [APPLIED] systemd: Add separate option for systemd resolved
Date: Mon, 9 Mar 2026 08:22:26 +0100 [thread overview]
Message-ID: <20260309072227.4088398-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20260304123435.1730190-1-lapeddk@gmail.com>
Thanks, applied as 3740b9ea128d06c909854d0b543090c9dc2e4218.
Michael
[sent from post-receive hook]
On Mon, 09 Mar 2026 08:22:26 +0100, Lars Alex Pedersen <lapeddk@gmail.com> 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 <lapeddk@gmail.com>
> Message-Id: <20260304123435.1730190-1-lapeddk@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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
prev parent reply other threads:[~2026-03-09 7:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-04 12:34 [ptxdist] [PATCH v2 1/2] " Lars Alex Pedersen
2026-03-04 12:34 ` [ptxdist] [PATCH v2 2/2] rootfs: Add option for stub resolv when systemd-resolved is used Lars Alex Pedersen
2026-03-09 7:22 ` [ptxdist] [APPLIED] " Michael Olbrich
2026-03-09 7:22 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260309072227.4088398-1-m.olbrich@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=lapeddk@gmail.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox