From 692370ebf69409c3e12dd8e4a992aa8484858c78 Mon Sep 17 00:00:00 2001
From: tohurtv <tohur@rakuos.org>
Date: Mon, 17 Nov 2025 12:56:42 -0700
Subject: [PATCH] resolv.conf fixes

---
 debian/changelog                    |  2 +-
 helpers/calamares-bootloader-config | 12 ++++--------
 helpers/calamares-dpkg-unsafe-io    |  3 ++-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0c9d4d5..020b02b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-calamares-settings-rakuos (1.1.2-1rakuos9) UNRELEASED; urgency=medium
+calamares-settings-rakuos (1.2.2-1rakuos6) UNRELEASED; urgency=medium
 
   * First fork
   * Set btrfs as default filesystem 
diff --git a/helpers/calamares-bootloader-config b/helpers/calamares-bootloader-config
index 86a7fa7..ff317d9 100755
--- a/helpers/calamares-bootloader-config
+++ b/helpers/calamares-bootloader-config
@@ -26,14 +26,10 @@ fi
 sed -i "s/#GRUB_DISABLE_OS_PROBER=false/# OS_PROBER re-enabled by RakuOS Calamares installation:\nGRUB_DISABLE_OS_PROBER=false/g" $CHROOT/etc/default/grub
 chroot $CHROOT /usr/sbin/update-grub
 # Detect filesystem type of the installed system
-FS_TYPE=$(findmnt -n -o FSTYPE "$CHROOT" || true)
-
-echo "Filesystem detected inside chroot: $FS_TYPE"
-
-# Btrfs = Default path, keep grub-btrfs / snapper
+FS_TYPE=$(findmnt -n -o FSTYPE "$CHROOT")
 if [ "$FS_TYPE" = "btrfs" ]; then
-    echo " * Btrfs detected → leaving grub-btrfs + snapper installed"
+    echo " * Btrfs detected nothing to do"
 else
-    echo " * Non-Btrfs filesystem detected → removing grub-btrfs + snapper"
-    chroot "$CHROOT" apt-get -y purge snapper btrfs-assistant 2>/dev/null || true
+    echo " * Not a Btrfs filesystem, removing snapper, btrfs-assistant"
+    chroot "$CHROOT" apt-get -y purge snapper btrfs-assistant
 fi
diff --git a/helpers/calamares-dpkg-unsafe-io b/helpers/calamares-dpkg-unsafe-io
index 597cbf5..df61b78 100755
--- a/helpers/calamares-dpkg-unsafe-io
+++ b/helpers/calamares-dpkg-unsafe-io
@@ -9,5 +9,6 @@ if [ "$1" = "-u" ]; then
 fi
 
 echo "force-unsafe-io" > $CHROOT/etc/dpkg/dpkg.cfg.d/calamares-force-unsafe-io
-
+rm $CHROOT/etc/resolv.conf
+ln -sf /run/systemd/resolve/stub-resolv.conf $CHROOT/etc/resolv.conf
 exit 0