Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archiso
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2021-01-18 11:07:14 +0100
committerDavid Runge <dvzrv@archlinux.org>2021-01-26 21:59:01 +0000
commita2c8dd31731916600c5e4eb6b7d08a8ff9e287d3 (patch)
tree3497d56eab2867479ce830bdf075f11b94cd0778 /archiso
parentb30d1cad9bdf925b976b5d038a3ad741a70267c6 (diff)
archiso_pxe_common: remove resolv.conf before copy
Booting via PXE we want to keep our DNS configuration. So remove /etc/resolv.conf in new root before copying the current file. Without this systemd-resolved fallback nameservers are used and we see an error message when the root ships a symbolic link to systemd-resolved's stub-resolv.conf: cp: not writing through dangling symlink '/new_root/etc/resolv.conf'
Diffstat (limited to 'archiso')
-rw-r--r--archiso/initcpio/hooks/archiso_pxe_common1
1 files changed, 1 insertions, 0 deletions
diff --git a/archiso/initcpio/hooks/archiso_pxe_common b/archiso/initcpio/hooks/archiso_pxe_common
index 2e567ec..a47b6c0 100644
--- a/archiso/initcpio/hooks/archiso_pxe_common
+++ b/archiso/initcpio/hooks/archiso_pxe_common
@@ -73,6 +73,7 @@ run_latehook () {
ip link set "${netdev}" down
done
elif [ "${copy_resolvconf}" != "n" ] && [ -f /etc/resolv.conf ]; then
+ rm -f /new_root/etc/resolv.conf
cp /etc/resolv.conf /new_root/etc/resolv.conf
fi
fi