From 82b91880dac2c700048436c73f4a7559f1a00bfb Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Mon, 20 Jun 2016 16:40:47 -0700 Subject: [PATCH] app-emulation/wa-linux-agent: backport sudoers fix --- .../0001-fix-sudo-asking-for-password.patch | 22 +++++++++++++++++++ ....ebuild => wa-linux-agent-2.1.3-r1.ebuild} | 4 ++++ 2 files changed, 26 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/files/0001-fix-sudo-asking-for-password.patch rename sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/{wa-linux-agent-2.1.3.ebuild => wa-linux-agent-2.1.3-r1.ebuild} (90%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/files/0001-fix-sudo-asking-for-password.patch b/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/files/0001-fix-sudo-asking-for-password.patch new file mode 100644 index 0000000000..f6a6ed5adf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/files/0001-fix-sudo-asking-for-password.patch @@ -0,0 +1,22 @@ +From 0dc86a2df78b6c80de0533fcfac14a49716f5435 Mon Sep 17 00:00:00 2001 +From: Eric Williams +Date: Sun, 19 Jun 2016 10:28:05 +0100 +Subject: [PATCH] Fix sudo asking for password + +--- + azurelinuxagent/distro/default/osutil.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/azurelinuxagent/distro/default/osutil.py b/azurelinuxagent/distro/default/osutil.py +index 18ab2ba..1685f31 100644 +--- a/azurelinuxagent/distro/default/osutil.py ++++ b/azurelinuxagent/distro/default/osutil.py +@@ -124,7 +124,7 @@ def conf_sudoer(self, username, nopasswd): + fileutil.append_file('/etc/sudoers', sudoers) + sudoer = None + if nopasswd: +- sudoer = "{0} ALL = (ALL) NOPASSWD\n".format(username) ++ sudoer = "{0} ALL = (ALL) NOPASSWD: ALL\n".format(username) + else: + sudoer = "{0} ALL = (ALL) ALL\n".format(username) + fileutil.append_file('/etc/sudoers.d/waagent', sudoer) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.1.3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.1.3-r1.ebuild similarity index 90% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.1.3.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.1.3-r1.ebuild index aa5ef02a44..8aa6a1f028 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.1.3.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/wa-linux-agent/wa-linux-agent-2.1.3-r1.ebuild @@ -14,6 +14,10 @@ IUSE="" RDEPEND="dev-lang/python-oem" +PATCHES=( + "${FILESDIR}/0001-fix-sudo-asking-for-password.patch" +) + S="${WORKDIR}/WALinuxAgent-${PV}" src_install() {