summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Howard <ben.howard@ubuntu.com>2012-12-07 16:52:42 -0700
committerusd-importer <ubuntu-server@lists.ubuntu.com>2012-12-12 17:03:27 +0000
commit6b49265dcb38dbd2b7be6cf311f6c4807d36abb1 (patch)
tree1d65382b4a57dd757c9f00cd937476e093af9a91
parent961f38d3d7621d3d6f48d4216fcfb3b3ab806f72 (diff)
downloadvyos-walinuxagent-6b49265dcb38dbd2b7be6cf311f6c4807d36abb1.tar.gz
vyos-walinuxagent-6b49265dcb38dbd2b7be6cf311f6c4807d36abb1.zip
000_use_package_upstart.patch
No DEP3 Subject or Description header found Gbp-Pq: 000_use_package_upstart.patch.
-rw-r--r--waagent7
1 files changed, 2 insertions, 5 deletions
diff --git a/waagent b/waagent
index 9ab05c0..ab42009 100644
--- 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