From 8b4eae304d5e053865028480cf035ed103d2161f Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Tue, 17 Mar 2015 11:05:22 -0700 Subject: [PATCH] app-emulation/wa-linux-agent: bump to 2.0.12 --- ...-implementation-of-restartSshService.patch | 34 ------------------- ...r2.ebuild => wa-linux-agent-2.0.12.ebuild} | 6 +--- 2 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/files/0001-Fix-CoreOS-implementation-of-restartSshService.patch rename sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/{wa-linux-agent-2.0.11-r2.ebuild => wa-linux-agent-2.0.12.ebuild} (76%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/files/0001-Fix-CoreOS-implementation-of-restartSshService.patch b/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/files/0001-Fix-CoreOS-implementation-of-restartSshService.patch deleted file mode 100644 index 9a7b521ed4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/files/0001-Fix-CoreOS-implementation-of-restartSshService.patch +++ /dev/null @@ -1,34 +0,0 @@ -From d7267ca77201e09f9bfb78036530ac117943814c Mon Sep 17 00:00:00 2001 -From: Alex Crawford -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 - diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.0.11-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.0.12.ebuild similarity index 76% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.0.11-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.0.12.ebuild index c92db3b397..6578e4fbe6 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.0.11-r2.ebuild +++ b/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