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_use_package_upstart.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 debian/patches/000_use_package_upstart.patch (limited to 'debian/patches/000_use_package_upstart.patch') diff --git a/debian/patches/000_use_package_upstart.patch b/debian/patches/000_use_package_upstart.patch new file mode 100644 index 0000000..dce93cd --- /dev/null +++ b/debian/patches/000_use_package_upstart.patch @@ -0,0 +1,16 @@ +--- a/waagent ++++ b/waagent +@@ -2242,11 +2242,8 @@ def Install(): + Warn("Moved " + a + " -> " + LibDir + "/" + GetLastPathElement(a) ) + + if IsUbuntu(): +- # Support for Ubuntu's upstart configuration +- filename="waagent.conf" +- filepath = "/etc/init/" + filename +- SetFileContents(filepath, Init_Ubuntu) +- os.chmod(filepath, 0644) ++ # Use the Ubuntu packaged upstart job. ++ Log("Using Ubuntu packaged upstart job. Skipping upstart installation") + + else: + # Regular init.d configurations -- cgit v1.2.3