Merge pull request #1147 from crawford/waagent

app-emulation/wa-linux-agent: bump to 2.0.12

sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/files/0001-Fix-CoreOS-implementation-of-restartSshService.patch

@@ -1,34 +0,0 @@
-From d7267ca77201e09f9bfb78036530ac117943814c Mon Sep 17 00:00:00 2001
-From: Alex Crawford <alex.crawford@coreos.com>
-Date: Tue, 10 Feb 2015 15:23:37 -0800
-Subject: [PATCH] Fix CoreOS implementation of restartSshService
-
-Because SSH is socket activated on CoreOS, there is no need to restart
-it. In fact, starting it causes it to fail while binding to port 22,
-which sshd.socket has already bound.
----
- waagent | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/waagent b/waagent
-index 2e5909b..fc98056 100644
---- a/waagent
-+++ b/waagent
-@@ -1060,12 +1060,9 @@ class CoreOSDistro(AbstractDistro):
- 
-     def restartSshService(self):
-         """
--        Service call to re(start) the SSH service
-+        SSH is socket activated on CoreOS. No need to restart it.
-         """
--        retcode = Run("systemctl restart sshd")
--        if retcode > 0:
--            Error("Failed to restart SSH service with return code:" + str(retcode))
--        return retcode
-+        return 0
- 
-     def sshDeployPublicKey(self,fprint,path):
-         """
--- 
-1.9.3
-

sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.0.12.ebuild

@@ -7,7 +7,7 @@
 EAPI=4
 
 EGIT_REPO_URI="git://github.com/Azure/WALinuxAgent"
-EGIT_COMMIT="b3f2619a854455675ae5f2ee14726659e0398af7" # WALinuxAgent-2.0.11
+EGIT_COMMIT="26785b64279913d416767a6288a3b3f970ed4522" # WALinuxAgent-2.0.12
 EGIT_MASTER="2.0"
 
 inherit eutils toolchain-funcs git-2
@@ -23,10 +23,6 @@ IUSE=""
 
 RDEPEND="dev-lang/python-oem"
 
-src_prepare() {
-	epatch "${FILESDIR}"/0001-Fix-CoreOS-implementation-of-restartSshService.patch
-}
-
 src_install() {
 	into "/usr/share/oem"
 	dobin "${S}"/waagent