From ebb978cce0687650a55467fe50fd16a84db05b36 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 09 2017 11:13:41 +0000
Subject: import WALinuxAgent-2.2.4-1.el6


---

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-auto-update.patch b/SOURCES/0002-Disable-auto-update.patch
new file mode 100644
index 0000000..abee60b
--- /dev/null
+++ b/SOURCES/0002-Disable-auto-update.patch
@@ -0,0 +1,25 @@
+From 6b80e77324a56a8e7e4feb023c940603efb058f3 Mon Sep 17 00:00:00 2001
+From: Miroslav Rezanina <mrezanin@redhat.com>
+Date: Wed, 8 Feb 2017 11:23:29 +0100
+Subject: Disable auto update
+
+---
+ 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-Disable-auto-update-when-upgrading.patch b/SOURCES/0003-Disable-auto-update-when-upgrading.patch
new file mode 100644
index 0000000..c5eb9f5
--- /dev/null
+++ b/SOURCES/0003-Disable-auto-update-when-upgrading.patch
@@ -0,0 +1,25 @@
+From d3f66f3aadf4c277a3b22182a0648d618e0fa2cb Mon Sep 17 00:00:00 2001
+From: Miroslav Rezanina <mrezanin@redhat.com>
+Date: Wed, 8 Feb 2017 11:25:26 +0100
+Subject: Disable 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-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 d3f5c9a..4c68671 100644
--- a/SPECS/WALinuxAgent.spec
+++ b/SPECS/WALinuxAgent.spec
@@ -1,7 +1,7 @@
 %define name WALinuxAgent
-%define version 2.2.0
-%define unmangled_version 2.2.0
-%define release 2
+%define version 2.2.4
+%define unmangled_version 2.2.4
+%define release 1
 
 %if 0%{?rhel} < 7
 %global initsys sysV
@@ -13,9 +13,10 @@ Summary: UNKNOWN
 Name: %{name}
 Version: %{version}
 Release: %{release}%{?dist}
-Source0: %{name}-%{unmangled_version}.tar.gz
-Patch0: agent-no-auto-update.patch
-Patch1: agent-no-auto-update-when-upgrading.patch
+Source0: WALinuxAgent-2.2.4.tar.gz
+Patch0002: 0002-Disable-auto-update.patch
+Patch0003: 0003-Disable-auto-update-when-upgrading.patch
+
 License: Apache License Version 2.0
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -68,8 +69,9 @@ images that are built to run in the Azure environment.
 
 %prep
 %setup -n %{name}-%{unmangled_version} -n %{name}-%{unmangled_version}
-%patch0 -p1
-%patch1 -p1
+
+%patch0002 -p1
+%patch0003 -p1
 
 %build
 python setup.py build
@@ -118,6 +120,11 @@ fi
 %defattr(-,root,root)
 
 %changelog
+* Mon Mar 01 2017 Miroslav Rezanina <mrezanin@redhat.com> - 2.2.4-1
+- Rebase to 2.2.4 [bz#1419200]
+- Resolves: bz#1419200
+  WALA 2.2.4
+
 * Fri Nov 04 2016 Dave Anderson <anderson@redhat.com> - 2.2.0-2
 - Set AutoUpdate.Enabled=n
 - Set implicit default of AutoUpdate.Enabled=n when upgrading