From 961f38d3d7621d3d6f48d4216fcfb3b3ab806f72 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Fri, 7 Dec 2012 16:52:42 -0700 Subject: Import patches-unapplied version 1.2-0ubuntu1 to ubuntu/raring-proposed Imported using git-ubuntu import. Changelog parent: 908c9c67eab553877bc5d16e2d52318d1d8ce8f9 New changelog entries: * New upstream version (LP: #1077148) * Upstream features: - Added - load ata_piix.ko module loaded if needed for CDROM device support - Additional logging for DoDhcpWork() - Update sock.recv timeout from 30 to 10 seconds - Fix: Linux waagent deprovision, user is not deleted properly - Fix: Make LBProbeResponder construction more robust - Fix: Agent fails to provision user with public/private key pairs - Fix: DHCP broadcast response not received - Fix: Linux agent fails to delete root user password - Fix: Linux agent should report error messages to Fabric when passed an invalid hostname. * Dropped Ubuntu specific patches - Removed debian/patches/000_resolv-conf.patch as upstream now supports resolvconf properly. - Removed debian/patches/001-strip-init-d.patch as redundant now that upstream understands Ubuntu upstart. Upstream script does not handle the removal of the upstart job anyway. * Added debian/patches/000_use_package_upstart.patch to use packaged upstart job over in-script upstart. --- debian/patches/000_resolv-conf.patch | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 debian/patches/000_resolv-conf.patch (limited to 'debian/patches/000_resolv-conf.patch') diff --git a/debian/patches/000_resolv-conf.patch b/debian/patches/000_resolv-conf.patch deleted file mode 100644 index 23404da..0000000 --- a/debian/patches/000_resolv-conf.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: wa-new/waagent -=================================================================== ---- wa-new.orig/waagent 2012-11-14 11:06:12.227371000 -0700 -+++ wa-new/waagent 2012-11-14 11:07:53.093401274 -0700 -@@ -2262,7 +2262,26 @@ - Run("rm -f " + a + "/*") - - # Clear LibDir, remove nameserver and root bash history -- for f in os.listdir(LibDir) + ["/etc/resolv.conf", "/root/.bash_history", "/var/log/waagent.log"]: -+ fileBlackList = [ "/root/.bash_history", "/var/log/waagent.log" ] -+ -+ if IsUbuntu(): -+ # Ubuntu uses resolv.conf by default, so removing /etc/resolv.conf will -+ # break resolvconf. Therefore, we check to see if resolvconf is in use, -+ # and if so, we remove the resolvconf artifacts. -+ -+ if os.path.realpath('/etc/resolv.conf') != '/run/resolvconf/resolv.conf': -+ Log("resolvconf is not configured. Removing /etc/resolv.conf") -+ fileBlackList.append('/etc/resolv.conf') -+ else: -+ Log("resolvconf is enabled; leaving /etc/resolv.conf intact") -+ resolvConfD = '/etc/resolvconf/resolv.conf.d/' -+ fileBlackList.extend([resolvConfD + 'tail', resolvConfD + 'originial' ]) -+ else: -+ fileBlackList.append(os.listdir(LibDir) + '/etc/resolv.conf') -+ -+ -+ # Clear LibDir, remove nameserver and root bash history -+ for f in os.listdir(LibDir) + fileBlackList: - try: - os.remove(f) - except: -- cgit v1.2.3