From df67477a9af4d6fa46bd035e7787cd2db7a4535d Mon Sep 17 00:00:00 2001
From: Mikhail Gordeev <obirvalger@altlinux.org>
Date: Thu, 19 Aug 2021 01:57:59 +0300
Subject: [PATCH] net: Add networkd/resolved and networkd/resolved-stub
 subfeatures

Creates systemd-resolved symbolic link to /etc/resolv.conf
---
 features.in/net/config.mk                              |  9 +++++++++
 .../rootfs/image-scripts.d/99-systemd-resolved-link    | 10 ++++++++++
 2 files changed, 19 insertions(+)
 create mode 100755 features.in/net/rootfs/image-scripts.d/99-systemd-resolved-link

diff --git a/features.in/net/config.mk b/features.in/net/config.mk
index b8e01cd1..28eb9e74 100644
--- a/features.in/net/config.mk
+++ b/features.in/net/config.mk
@@ -43,3 +43,12 @@ use/net/connman: use/net
 use/net/networkd: use/net
 	@$(call set,THE_NET_SUBSYS,systemd-networkd)
 	@$(call add,DEFAULT_SERVICES_ENABLE,systemd-networkd)
+	@$(call xport,SYSTEMD_RESOLVED)
+
+use/net/networkd/resolved: use/net/networkd
+	@$(call add,DEFAULT_SERVICES_ENABLE,systemd-resolved)
+	@$(call set,SYSTEMD_RESOLVED,yes)
+
+use/net/networkd/resolved-stub: use/net/networkd
+	@$(call add,DEFAULT_SERVICES_ENABLE,systemd-resolved)
+	@$(call set,SYSTEMD_RESOLVED,stub)
diff --git a/features.in/net/rootfs/image-scripts.d/99-systemd-resolved-link b/features.in/net/rootfs/image-scripts.d/99-systemd-resolved-link
new file mode 100755
index 00000000..986f0c97
--- /dev/null
+++ b/features.in/net/rootfs/image-scripts.d/99-systemd-resolved-link
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+[ -h /sbin/init ] || exit 0
+[ -n "$GLOBAL_SYSTEMD_RESOLVED" ] || exit 0
+
+if [ "$GLOBAL_SYSTEMD_RESOLVED" = stub ]; then
+    ln -sf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf
+else
+    ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf
+fi
-- 
2.24.1