resolv.conf fixes

This commit is contained in:
2025-11-17 12:56:42 -07:00
parent 016b1dfcca
commit 692370ebf6
3 changed files with 7 additions and 10 deletions

2
debian/changelog vendored
View File

@@ -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 * First fork
* Set btrfs as default filesystem * Set btrfs as default filesystem

View File

@@ -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 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 chroot $CHROOT /usr/sbin/update-grub
# Detect filesystem type of the installed system # Detect filesystem type of the installed system
FS_TYPE=$(findmnt -n -o FSTYPE "$CHROOT" || true) FS_TYPE=$(findmnt -n -o FSTYPE "$CHROOT")
echo "Filesystem detected inside chroot: $FS_TYPE"
# Btrfs = Default path, keep grub-btrfs / snapper
if [ "$FS_TYPE" = "btrfs" ]; then if [ "$FS_TYPE" = "btrfs" ]; then
echo " * Btrfs detected → leaving grub-btrfs + snapper installed" echo " * Btrfs detected nothing to do"
else else
echo " * Non-Btrfs filesystem detected → removing grub-btrfs + snapper" echo " * Not a Btrfs filesystem, removing snapper, btrfs-assistant"
chroot "$CHROOT" apt-get -y purge snapper btrfs-assistant 2>/dev/null || true chroot "$CHROOT" apt-get -y purge snapper btrfs-assistant
fi fi

View File

@@ -9,5 +9,6 @@ if [ "$1" = "-u" ]; then
fi fi
echo "force-unsafe-io" > $CHROOT/etc/dpkg/dpkg.cfg.d/calamares-force-unsafe-io 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 exit 0