diff --git a/.WALinuxAgent.metadata b/.WALinuxAgent.metadata index f14b715..70f09a7 100644 --- a/.WALinuxAgent.metadata +++ b/.WALinuxAgent.metadata @@ -1 +1 @@ -0110c0830fb37f54a69eeacad063b92d8707e679 SOURCES/WALinuxAgent-2.2.0.tar.gz +2bfb5473dddf2d87f959cc2ca6ae856a8aa13446 SOURCES/WALinuxAgent-2.2.4.tar.gz diff --git a/.gitignore b/.gitignore index b4a6f8f..5ce205d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/WALinuxAgent-2.2.0.tar.gz +SOURCES/WALinuxAgent-2.2.4.tar.gz diff --git a/SOURCES/0002-Disable-autoupdate.patch b/SOURCES/0002-Disable-autoupdate.patch new file mode 100644 index 0000000..2c69291 --- /dev/null +++ b/SOURCES/0002-Disable-autoupdate.patch @@ -0,0 +1,25 @@ +From cb83841b57b2d5f3f8a24cec4a6e9bc246bd15f8 Mon Sep 17 00:00:00 2001 +From: Miroslav Rezanina +Date: Mon, 16 Jan 2017 17:40:12 +0100 +Subject: Disable autoupdate + +--- + config/waagent.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/waagent.conf b/config/waagent.conf +index 8a69462..77a0c7e 100644 +--- a/config/waagent.conf ++++ b/config/waagent.conf +@@ -86,7 +86,7 @@ OS.OpensslPath=None + # OS.EnableRDMA=y + + # Enable or disable goal state processing auto-update, default is enabled +-# AutoUpdate.Enabled=y ++AutoUpdate.Enabled=n + + # Determine the update family, this should not be changed + # AutoUpdate.GAFamily=Prod +-- +1.8.3.1 + diff --git a/SOURCES/0003-No-auto-update-when-upgrading.patch b/SOURCES/0003-No-auto-update-when-upgrading.patch new file mode 100644 index 0000000..ab85d0a --- /dev/null +++ b/SOURCES/0003-No-auto-update-when-upgrading.patch @@ -0,0 +1,25 @@ +From 7e555748e2ad77da55d84d7be59a0c527f72ea2f Mon Sep 17 00:00:00 2001 +From: Miroslav Rezanina +Date: Mon, 16 Jan 2017 17:41:35 +0100 +Subject: No auto update when upgrading + +--- + azurelinuxagent/common/conf.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/azurelinuxagent/common/conf.py b/azurelinuxagent/common/conf.py +index 7911699..c45ec96 100644 +--- a/azurelinuxagent/common/conf.py ++++ b/azurelinuxagent/common/conf.py +@@ -219,7 +219,7 @@ def get_autoupdate_gafamily(conf=__conf__): + + + def get_autoupdate_enabled(conf=__conf__): +- return conf.get_switch("AutoUpdate.Enabled", True) ++ return conf.get_switch("AutoUpdate.Enabled", False) + + + def get_autoupdate_frequency(conf=__conf__): +-- +1.8.3.1 + diff --git a/SOURCES/agent-RHEL-7-hostname-533.patch b/SOURCES/agent-RHEL-7-hostname-533.patch deleted file mode 100644 index 0dec5d3..0000000 --- a/SOURCES/agent-RHEL-7-hostname-533.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 845e4647f72d27fc9aeaee5cd69d40a052d85f62 Mon Sep 17 00:00:00 2001 -From: Vitaly Kuznetsov -Date: Wed, 11 Jan 2017 16:40:59 +0100 -Subject: [PATCH 1/2] RHEL-7 hostname (#533) - -RH-Author: Vitaly Kuznetsov -Message-id: <20170111164100.436-2-vkuznets@redhat.com> -Patchwork-id: 73240 -O-Subject: [RHEL-7.4/7.3.z WALinuxAgent PATCH 1/2] RHEL-7 hostname (#533) -Bugzilla: 1413674 -RH-Acked-by: Cathy Avery - -From: Hans Krijger - -* use hostnamectl for redhat 7.x - -* create directory if it is missing - -(cherry picked from commit 8f91a15cd59b6ed81cdfa28e6014a226ce613c9e) -Signed-off-by: Miroslav Rezanina ---- - azurelinuxagent/common/osutil/redhat.py | 5 ++--- - azurelinuxagent/ga/exthandlers.py | 3 +++ - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/azurelinuxagent/common/osutil/redhat.py b/azurelinuxagent/common/osutil/redhat.py -index 80370a2..f8372f0 100644 ---- a/azurelinuxagent/common/osutil/redhat.py -+++ b/azurelinuxagent/common/osutil/redhat.py -@@ -96,10 +96,9 @@ class RedhatOSUtil(Redhat6xOSUtil): - - def set_hostname(self, hostname): - """ -- Set /etc/hostname -- Unlike redhat 6.x, redhat 7.x will set hostname to /etc/hostname -+ Unlike redhat 6.x, redhat 7.x will set hostname via hostnamectl - """ -- DefaultOSUtil.set_hostname(self, hostname) -+ shellutil.run("hostnamectl {0}".format(hostname)) - - def publish_hostname(self, hostname): - """ -diff --git a/azurelinuxagent/ga/exthandlers.py b/azurelinuxagent/ga/exthandlers.py -index 192300e..5b35f45 100644 ---- a/azurelinuxagent/ga/exthandlers.py -+++ b/azurelinuxagent/ga/exthandlers.py -@@ -798,6 +798,9 @@ class ExtHandlerInstance(object): - def set_handler_state(self, handler_state): - state_dir = self.get_conf_dir() - try: -+ if not os.path.exists(state_dir): -+ fileutil.mkdir(state_dir, mode=0o700) -+ - state_file = os.path.join(state_dir, "HandlerState") - fileutil.write_file(state_file, handler_state) - except IOError as e: --- -1.8.3.1 - diff --git a/SOURCES/agent-fix-for-hostnamectl-534.patch b/SOURCES/agent-fix-for-hostnamectl-534.patch deleted file mode 100644 index 9dd991c..0000000 --- a/SOURCES/agent-fix-for-hostnamectl-534.patch +++ /dev/null @@ -1,36 +0,0 @@ -From f51337e5b8746ccb4402129c9bd3d86c578e49f0 Mon Sep 17 00:00:00 2001 -From: Vitaly Kuznetsov -Date: Wed, 11 Jan 2017 16:41:00 +0100 -Subject: [PATCH 2/2] fix for hostnamectl (#534) - -RH-Author: Vitaly Kuznetsov -Message-id: <20170111164100.436-3-vkuznets@redhat.com> -Patchwork-id: 73241 -O-Subject: [RHEL-7.4/7.3.z WALinuxAgent PATCH 2/2] fix for hostnamectl (#534) -Bugzilla: 1413674 -RH-Acked-by: Cathy Avery - -From: Hans Krijger - -(cherry picked from commit 5949843494a0c00d852f01e35a87d34674960f2b) -Signed-off-by: Miroslav Rezanina ---- - azurelinuxagent/common/osutil/redhat.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/azurelinuxagent/common/osutil/redhat.py b/azurelinuxagent/common/osutil/redhat.py -index f8372f0..8e86f6e 100644 ---- a/azurelinuxagent/common/osutil/redhat.py -+++ b/azurelinuxagent/common/osutil/redhat.py -@@ -98,7 +98,7 @@ class RedhatOSUtil(Redhat6xOSUtil): - """ - Unlike redhat 6.x, redhat 7.x will set hostname via hostnamectl - """ -- shellutil.run("hostnamectl {0}".format(hostname)) -+ shellutil.run("hostnamectl set-hostname {0}".format(hostname)) - - def publish_hostname(self, hostname): - """ --- -1.8.3.1 - diff --git a/SOURCES/agent-no-auto-update-when-upgrading.patch b/SOURCES/agent-no-auto-update-when-upgrading.patch deleted file mode 100644 index fd1ffe4..0000000 --- a/SOURCES/agent-no-auto-update-when-upgrading.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- WALinuxAgent-2.2.0/azurelinuxagent/common/conf.py.orig -+++ WALinuxAgent-2.2.0/azurelinuxagent/common/conf.py -@@ -213,7 +213,7 @@ def get_autoupdate_gafamily(conf=__conf_ - - - def get_autoupdate_enabled(conf=__conf__): -- return conf.get_switch("AutoUpdate.Enabled", True) -+ return conf.get_switch("AutoUpdate.Enabled", False) - - - def get_autoupdate_frequency(conf=__conf__): diff --git a/SOURCES/agent-no-auto-update.patch b/SOURCES/agent-no-auto-update.patch deleted file mode 100644 index b32483c..0000000 --- a/SOURCES/agent-no-auto-update.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- WALinuxAgent-2.2.0/config/waagent.conf.orig -+++ WALinuxAgent-2.2.0/config/waagent.conf -@@ -86,7 +86,7 @@ OS.OpensslPath=None - # OS.EnableRDMA=y - - # Enable or disable goal state processing auto-update, default is enabled --# AutoUpdate.Enabled=y -+AutoUpdate.Enabled=n - - # Determine the update family, this should not be changed - # AutoUpdate.GAFamily=Prod diff --git a/SPECS/WALinuxAgent.spec b/SPECS/WALinuxAgent.spec index c7ad869..225e330 100644 --- a/SPECS/WALinuxAgent.spec +++ b/SPECS/WALinuxAgent.spec @@ -1,6 +1,7 @@ %define name WALinuxAgent -%define version 2.2.0 -%define unmangled_version 2.2.0 +%define version 2.2.4 +%define unmangled_version 2.2.4 +%define release 1 %if 0%{?rhel} < 7 %global initsys sysV @@ -11,14 +12,11 @@ Summary: UNKNOWN Name: %{name} Version: %{version} -Release: 4%{?dist} -Source0: %{name}-%{unmangled_version}.tar.gz -Patch0: agent-no-auto-update.patch -Patch1: agent-no-auto-update-when-upgrading.patch -# For bz#1413674 - [WALA] Fail to send hostname to DHCP server during provisioning -Patch2: agent-RHEL-7-hostname-533.patch -# For bz#1413674 - [WALA] Fail to send hostname to DHCP server during provisioning -Patch3: agent-fix-for-hostnamectl-534.patch +Release: %{release}%{?dist} +Source0: WALinuxAgent-2.2.4.tar.gz +Patch2: 0002-Disable-autoupdate.patch +Patch3: 0003-No-auto-update-when-upgrading.patch + License: Apache License Version 2.0 Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot @@ -71,8 +69,7 @@ images that are built to run in the Azure environment. %prep %setup -n %{name}-%{unmangled_version} -n %{name}-%{unmangled_version} -%patch0 -p1 -%patch1 -p1 + %patch2 -p1 %patch3 -p1 @@ -123,20 +120,17 @@ fi %defattr(-,root,root) %changelog -* Mon Jan 16 2017 Miroslav Rezanina - 2.2.0-4.el7_3 +* Wed Mar 01 2017 Miroslav Rezanina - 2.2.4-1.el7 +- Rebase to 2.2.4 [bz#1419201] +- resolves: bz#1419201 + WALA 2.2.4 + +* Mon Jan 16 2017 Miroslav Rezanina - 2.2.0-4.el7 - agent-RHEL-7-hostname-533.patch [bz#1413674] - agent-fix-for-hostnamectl-534.patch [bz#1413674] - Resolves: bz#1413674 ([WALA] Fail to send hostname to DHCP server during provisioning) -* Thu Nov 03 2016 Dave Anderson - 2.2.0-3 -- Set implicit default of AutoUpdate.Enabled=n when upgrading - Resolves: rhbz#1374115 - -* Fri Oct 28 2016 Dave Anderson - 2.2.0-2 -- Set AutoUpdate.Enabled=n - Resolves: rhbz#1374115 - * Fri Sep 30 2016 Dave Anderson - 2.2.0-1 - Update to v2.2.0 Resolves: rhbz#1360492