diff --git a/archx.sh b/archx.sh index fb31ead..f955d44 100644 --- a/archx.sh +++ b/archx.sh @@ -312,8 +312,11 @@ basic_postinstall(){ fi if [[ -n $cinetwork ]]; then - cp /etc/systemd/network/??-cloud-init-*.link /etc/systemd/network/??-cloud-init-*.network /mnt/etc/systemd/network || : # ignore failures because file doesn't exist + set +e # we briefly need errors ignored + cp /etc/systemd/network/??-cloud-init-*.link /mnt/etc/systemd/network || : # ignore failures because file doesn't exist + cp /etc/systemd/network/??-cloud-init-*.network /mnt/etc/systemd/network || : # ignore failures because file doesn't exist cat /mnt/etc/systemd/network/??-cloud-init-*.network | grep -E 'DNS|Domains' | sed 's/DNS=/nameserver /g' | sed 's/Domains=/search /g' >> /mnt/etc/resolv.conf + set -e # reenable exit-on-error # Fix up multiple match clauses generated by borked cloud-init for f in /mnt/etc/systemd/network/??-cloud-init-*.network; do