diff options
| author | Ben Howard <ben.howard@ubuntu.com> | 2013-01-18 15:43:08 -0700 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2013-01-30 20:03:24 +0000 |
| commit | 34fd9d919b439b0bdc83c95230c9519470334caa (patch) | |
| tree | a48f68c0f645a32686b04c384a457b42188aba8c /debian/patches/000_use_package_upstart.patch | |
| parent | ce82ffdafaeeeeb4dae2024a32ae7488901b0627 (diff) | |
| parent | d34256f997e5da4fd5b454aea329e0bf59f7a19e (diff) | |
| download | vyos-walinuxagent-34fd9d919b439b0bdc83c95230c9519470334caa.tar.gz vyos-walinuxagent-34fd9d919b439b0bdc83c95230c9519470334caa.zip | |
Import patches-applied version 1.3-0ubuntu1 to applied/ubuntu/raring-proposed
Imported using git-ubuntu import.
Changelog parent: ce82ffdafaeeeeb4dae2024a32ae7488901b0627
Unapplied parent: d34256f997e5da4fd5b454aea329e0bf59f7a19e
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.
Diffstat (limited to 'debian/patches/000_use_package_upstart.patch')
| -rw-r--r-- | debian/patches/000_use_package_upstart.patch | 16 |
1 files changed, 0 insertions, 16 deletions
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 |