Merge branch 'focal-buildd-fix-dns' of lp:~davidkrauser/livecd-rootfs/+git/livecd-rootfs into ubuntu/master

Safely set /etc/resolv.conf to an empty file in buildd images

MP: https://code.launchpad.net/~davidkrauser/livecd-rootfs/+git/livecd-rootfs/+merge/381316
This commit is contained in:
Robert C Jennings 2020-03-31 09:53:57 -05:00
commit dcded9305c
No known key found for this signature in database
GPG Key ID: 740C3D9EEDF2ED73

View File

@ -1,4 +1,3 @@
#!/bin/sh
set -e
chroot chroot truncate -s 0 /etc/resolv.conf
#!/bin/sh -e
chroot chroot rm /etc/resolv.conf
chroot chroot touch /etc/resolv.conf