Ryan Lane has uploaded a new change for review. https://gerrit.wikimedia.org/r/113092
Change subject: Ensure resolv.conf is generated properly in labs images ...................................................................... Ensure resolv.conf is generated properly in labs images When vmbuilder creates new images resolv.conf info is baked into the image, making it datacenter specific. This change empties the /etc/resolvconf/resolv.conf.d/original file in the image so that dhclient's reconfiguration of resolv.conf will work properly. Change-Id: I5d32813d31188fabf77bf0c55344353c9a66e69b --- M modules/labs_vmbuilder/files/postinst.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/92/113092/1 diff --git a/modules/labs_vmbuilder/files/postinst.sh b/modules/labs_vmbuilder/files/postinst.sh index 51b3256..0e1d24b 100644 --- a/modules/labs_vmbuilder/files/postinst.sh +++ b/modules/labs_vmbuilder/files/postinst.sh @@ -1,5 +1,6 @@ #!/bin/bash +chroot $1 echo '' > /etc/resolvconf/resolv.conf.d/original chroot $1 passwd -ld root chroot $1 passwd -ld ubuntu chroot $1 printf "%s\t%s\t%s\t%s\n" cloud-init cloud-init/datasources multiselect "ConfigDrive, Ec2" | debconf-set-selections -- To view, visit https://gerrit.wikimedia.org/r/113092 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5d32813d31188fabf77bf0c55344353c9a66e69b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ryan Lane <rl...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
