From 0d13ca38dfb3a54e14b1d45a38c2a794a818afba Mon Sep 17 00:00:00 2001
From: isa <isa@subgraph.com>
Date: Fri, 6 Sep 2024 15:25:48 -0400
Subject: [PATCH] Fix failure of dns resolution in realms

---
 .../bbappends/networkmanager/watch-resolvconf.path       | 9 ---------
 .../bbappends/networkmanager/watch-resolvconf.service    | 7 -------
 .../recipes-citadel/bbappends/networkmanager_%.bbappend  | 4 ----
 .../recipes-citadel/citadel-config/citadel-config.bb     | 7 ++++++-
 4 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 meta-citadel/recipes-citadel/bbappends/networkmanager/watch-resolvconf.path
 delete mode 100644 meta-citadel/recipes-citadel/bbappends/networkmanager/watch-resolvconf.service

diff --git a/meta-citadel/recipes-citadel/bbappends/networkmanager/watch-resolvconf.path b/meta-citadel/recipes-citadel/bbappends/networkmanager/watch-resolvconf.path
deleted file mode 100644
index 09bdb8f..0000000
--- a/meta-citadel/recipes-citadel/bbappends/networkmanager/watch-resolvconf.path
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Watch /run/NetworkManager
-
-[Path]
-PathChanged=/run/NetworkManager
-MakeDirectory=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-citadel/recipes-citadel/bbappends/networkmanager/watch-resolvconf.service b/meta-citadel/recipes-citadel/bbappends/networkmanager/watch-resolvconf.service
deleted file mode 100644
index d4d1aab..0000000
--- a/meta-citadel/recipes-citadel/bbappends/networkmanager/watch-resolvconf.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Copy resolv.conf to /storage/citadel-state
-ConditionPathExists=/run/NetworkManager/resolv.conf
-ConditionPathExists=/storage/citadel-state
-[Service]
-Type=oneshot
-ExecStart=/bin/cp /run/NetworkManager/resolv.conf /storage/citadel-state/resolv.conf
diff --git a/meta-citadel/recipes-citadel/bbappends/networkmanager_%.bbappend b/meta-citadel/recipes-citadel/bbappends/networkmanager_%.bbappend
index 9a37276..bb4ceda 100644
--- a/meta-citadel/recipes-citadel/bbappends/networkmanager_%.bbappend
+++ b/meta-citadel/recipes-citadel/bbappends/networkmanager_%.bbappend
@@ -3,16 +3,12 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/networkmanager:"
 
 SRC_URI += "\
     file://NetworkManager.conf \
-    file://watch-resolvconf.path \
-    file://watch-resolvconf.service \
 "
 
 SYSTEMD_SERVICE:${PN} += "watch-resolvconf.path"
 
 do_install:append() {
     install -m 0644 ${WORKDIR}/NetworkManager.conf ${D}${sysconfdir}/NetworkManager/
-    install -m 644 ${WORKDIR}/watch-resolvconf.path ${D}${systemd_system_unitdir}
-    install -m 644 ${WORKDIR}/watch-resolvconf.service ${D}${systemd_system_unitdir}
 }
 PACKAGECONFIG = "nss systemd polkit wifi iwd vala nmcli bluez5"
 NETWORKMANAGER_FIREWALL_DEFAULT = "iptables"
diff --git a/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb b/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb
index c1b93d8..0ac09df 100644
--- a/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb
+++ b/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb
@@ -52,6 +52,8 @@ SRC_URI = "\
     file://systemd/installer-session-switcher.service \
     file://systemd/user/gnome-session@citadel-installer.target.d/session.conf \
     file://icons/citadel-installer.svg \
+    file://systemd/watch-resolvconf.service \
+    file://systemd/watch-resolvconf.path \
     file://skel/profile \
     file://skel/bashrc \
     file://skel/vimrc \
@@ -76,7 +78,7 @@ RDEPENDS:${PN} = "bash"
 
 inherit allarch systemd useradd
 
-SYSTEMD_SERVICE:${PN} = "zram-swap.service citadel-launch-default-realm.path x11-session-switcher.service citadel-installer-backend.service installer-session-switcher.service citadel-setpassword.service"
+SYSTEMD_SERVICE:${PN} = "zram-swap.service citadel-launch-default-realm.path x11-session-switcher.service citadel-installer-backend.service installer-session-switcher.service citadel-setpassword.service watch-resolvconf.service watch-resolvconf.path"
 
 do_install() {
     install -m 0755 -d ${D}/storage
@@ -120,6 +122,9 @@ do_install() {
     install -m 644 ${WORKDIR}/systemd/citadel-installer-backend.service ${D}${systemd_system_unitdir}
     install -m 644 ${WORKDIR}/systemd/installer-session-switcher.service ${D}${systemd_system_unitdir}
 
+    install -m 644 ${WORKDIR}/systemd/watch-resolvconf.service ${D}${systemd_system_unitdir}
+    install -m 644 ${WORKDIR}/systemd/watch-resolvconf.path ${D}${systemd_system_unitdir}
+
     install -m 644 ${WORKDIR}/systemd/citadel-setpassword.service ${D}${systemd_system_unitdir}
     install -m 0754 ${WORKDIR}/citadel-setpassword.sh ${D}${libexecdir}
     install -d ${D}${systemd_user_unitdir}/gnome-session@citadel-installer.target.d
-- 
2.45.2