From b62390fb93897d9f873c0d23ddfcd7d2def7204f Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Fri, 18 Jan 2013 15:43:08 -0700 Subject: Import patches-unapplied version 1.3-0ubuntu1 to ubuntu/raring-proposed Imported using git-ubuntu import. Changelog parent: 961f38d3d7621d3d6f48d4216fcfb3b3ab806f72 New changelog entries: * New upstream version (LP: #1101371) - Add some error checking and robustness to DVD mounting operation during provisioning - Remove redundant check for IP and Port in LoadBalancerProbe - Add check to self.computername to detect empty hostname in configuration - Fix manual uninstall on Ubuntu * Modified walinuxagent to recognize when its been packaged. --- debian/patches/000_use_package_upstart.patch | 16 ---------------- 1 file changed, 16 deletions(-) delete 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 deleted file mode 100644 index dce93cd..0000000 --- a/debian/patches/000_use_package_upstart.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- 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