This commit is contained in:
Laura Hausmann 2023-03-13 04:28:43 +01:00
parent 480631b3cc
commit 65b3f24156
Signed by untrusted user: zotan
GPG key ID: D044E84C5BE01605

View file

@ -313,10 +313,10 @@ basic_postinstall(){
if [[ -n $cinetwork ]]; then
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
@ -328,6 +328,8 @@ basic_postinstall(){
fi
done
set -e # reenable exit-on-error
archchroot "systemctl enable systemd-networkd"
fi
}