[ptxdist] [PATCH 1/2] systemd: Add separate option for systemd resolved

[ptxdist] [PATCH 1/2] systemd: Add separate option for systemd resolved

[Lars Alex Pedersen]

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>
---
 rules/systemd.make | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

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

[ptxdist] [PATCH 2/2] rootfs: Add option for stub resolv when systemd-resolved is used

[Lars Alex Pedersen]

The stub-resolv.conf allows using the DNS cache functionality in
systemd-resolved.

Signed-off-by: Lars Alex Pedersen <lapeddk@gmail.com>
---
 rules/rootfs.in | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/rules/rootfs.in b/rules/rootfs.in
index 93b53481d..9e8c8ff50 100644
--- a/rules/rootfs.in
+++ b/rules/rootfs.in
@@ -439,7 +439,7 @@ choice
 
 	config ROOTFS_RESOLV_SYSTEMD
 		bool
-		depends on SYSTEMD_NETWORK
+		depends on SYSTEMD_RESOLVED
 		prompt "link to /run/systemd/resolve/resolv.conf"
 		help
 		  If enabled, it installs /etc/resolv.conf as a link to
@@ -447,6 +447,16 @@ choice
 		  systemd-resolved and is filled with data from the systemd
 		  managed interfaces.
 
+	config ROOTFS_RESOLV_STUB_SYSTEMD
+		bool
+		depends on SYSTEMD_RESOLVED
+		prompt "link to /run/systemd/resolve/stub-resolv.conf"
+		help
+		  If enabled, it installs /etc/resolv.conf as a link to
+		  /run/systemd/resolve/stub-resolv.conf. This file is provided by
+		  systemd-resolved and is filled with data from the systemd
+		  managed interfaces.
+
 	config ROOTFS_RESOLV_STATIC
 		bool
 		depends on SYSTEMD_NETWORK
-- 
2.53.0