summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Luis Vazquez Gonzalez (Jose Vazquez) <jose.vazquez@canonical.com>2016-12-19 18:11:33 +0100
committerusd-importer <ubuntu-server@lists.ubuntu.com>2016-12-20 10:38:16 +0000
commitf9738a6262884c50504d51475f4d239d57427e99 (patch)
treef880075eaef07f652bac9c133d0099e8e207bf9f
parent7cf8cac21ab6430bd1656c5d4ca1c63d72e1b960 (diff)
downloadvyos-walinuxagent-f9738a6262884c50504d51475f4d239d57427e99.tar.gz
vyos-walinuxagent-f9738a6262884c50504d51475f4d239d57427e99.zip
Import patches-unapplied version 2.1.5-0ubuntu5 to ubuntu/zesty-proposed
Imported using git-ubuntu import. Changelog parent: 7cf8cac21ab6430bd1656c5d4ca1c63d72e1b960 New changelog entries: * debian/patches/lp-1650522-reenable-auto-update.patch: - Enable AutoUpdate again at config/ubuntu/waagent.conf (LP: #1650522)
-rw-r--r--debian/changelog7
-rw-r--r--debian/patches/lp-1650522-reenable-auto-update.patch20
-rw-r--r--debian/patches/series1
3 files changed, 28 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index ea06584..6f5fd83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+walinuxagent (2.1.5-0ubuntu5) zesty; urgency=medium
+
+ * debian/patches/lp-1650522-reenable-auto-update.patch:
+ - Enable AutoUpdate again at config/ubuntu/waagent.conf (LP: #1650522)
+
+ -- Jose Luis Vazquez Gonzalez (Jose Vazquez) <jose.vazquez@canonical.com> Mon, 19 Dec 2016 18:11:33 +0100
+
walinuxagent (2.1.5-0ubuntu4) yakkety; urgency=medium
* d/patches/fix-auto-update.patch:
diff --git a/debian/patches/lp-1650522-reenable-auto-update.patch b/debian/patches/lp-1650522-reenable-auto-update.patch
new file mode 100644
index 0000000..576e54c
--- /dev/null
+++ b/debian/patches/lp-1650522-reenable-auto-update.patch
@@ -0,0 +1,20 @@
+Description: re-enable AutoUpdate at waagent.conf
+ After having disabled AutoUpdates it was agreed with Azure that
+ the ubuntu package was required to re-enable them by default.
+Author: Jose Vazquez <jose.vazquez@canonical.com>
+Origin: upstream
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1650522
+Forwarded: not-needed
+Last-Update: 2016-12-16
+
+Index: walinuxagent-2.1.5/config/ubuntu/waagent.conf
+===================================================================
+--- walinuxagent-2.1.5.orig/config/ubuntu/waagent.conf
++++ walinuxagent-2.1.5/config/ubuntu/waagent.conf
+@@ -82,5 +82,5 @@ OS.OpensslPath=None
+ # OS.EnableRDMA=y
+
+ # Enable or disable self-update, default is enabled
+-AutoUpdate.Enabled=n
++AutoUpdate.Enabled=y
+ AutoUpdate.GAFamily=Prod
diff --git a/debian/patches/series b/debian/patches/series
index bc0bd89..dc77cc2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ disable_import_test.patch
disable_udev_overrides.patch
lp1623570-adjust-walinuxagent-service-after-and-wants.patch
fix-auto-update.patch
+lp-1650522-reenable-auto-update.patch