From 955824332a28a4b7dc6683808274bd6302c7ead1 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Tue, 10 Nov 2020 14:57:56 -0500 Subject: [PATCH] enable resolved for vps --- fai/config/scripts/GRUB_PC/11-iank | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/fai/config/scripts/GRUB_PC/11-iank b/fai/config/scripts/GRUB_PC/11-iank index ce78c15..1849d60 100755 --- a/fai/config/scripts/GRUB_PC/11-iank +++ b/fai/config/scripts/GRUB_PC/11-iank @@ -144,9 +144,18 @@ sed -i '$a kernel.sysrq=1 EOFOUTER +rm -f $target/etc/resolv.conf +ln -s ../run/systemd/resolve/stub-resolv.conf $target/etc/resolv.conf +# needed for bitfolk image +if [[ -e /a/bin/fai/fai-wrapper ]]; then + systemctl enable systemd-resolved + systemctl start systemd-resolved +fi + + # bitfolk installer handles the rest case $HOSTNAME in - bk) exit 0 ;; + bk|je) exit 0 ;; esac @@ -263,14 +272,6 @@ EOF fi -rm -f $target/etc/resolv.conf -ln -s ../run/systemd/resolve/stub-resolv.conf $target/etc/resolv.conf -# needed for bitfolk image -if [[ -e /a/bin/fai/fai-wrapper ]]; then - systemctl enable systemd-resolved - systemctl start systemd-resolved -fi - if ifclass LINODE; then mkdir -p $target/etc/initramfs-tools/conf.d cat >$target/etc/initramfs-tools/conf.d/mine <