9 files changed, 28 insertions, 69 deletions
diff --git a/debian/66-azure-storage.rules b/debian/66-azure-storage.rules
index 1b64824..461db71 100644..120000
--- a/debian/66-azure-storage.rules
+++ b/debian/66-azure-storage.rules
@@ -1,17 +1 @@
-ACTION!="add|change", GOTO="azure_end"
-SUBSYSTEM!="block", GOTO="azure_end"
-ATTRS{ID_VENDOR}!="Msft", GOTO="azure_end"
-ATTRS{ID_MODEL}!="Virtual_Disk", GOTO="azure_end"
-
-# Root has a GUID of 0000 as the second value
-# The resource/resource has GUID of 0001 as the second value
-ATTRS{device_id}=="?00000000-0000-*", ENV{fabric_name}="root", GOTO="azure_names"
-ATTRS{device_id}=="?00000000-0001-*", ENV{fabric_name}="resource", GOTO="azure_names"
-GOTO="azure_end"
-
-# Create the symlinks
-LABEL="azure_names"
-ENV{DEVTYPE}=="disk", SYMLINK+="disk/azure/$env{fabric_name}"
-ENV{DEVTYPE}=="partition", SYMLINK+="disk/azure/$env{fabric_name}-part%n"
-
-LABEL="azure_end"
+../config/66-azure-storage.rules
+\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index bdbae20..ed5f944 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+walinuxagent (2.1.5-0ubuntu1) yakkety; urgency=medium
+
+  * New upstream release (LP: #1603581)
+    - d/patches/disable-auto-update.patch:
+      - The new version introduces auto-updating of the agent to its latest
+        version via an internal mechanism; disable this
+    - d/patches/fix_shebangs.patch:
+      - Dropped in favour of the dh_python3 --shebang option.
+    - Refreshed d/patches/disable_udev_overrides.patch
+
+ -- Daniel Watkins <daniel.watkins@canonical.com>  Tue, 13 Sep 2016 16:11:47 +0100
+
 walinuxagent (2.1.3-0ubuntu4) xenial; urgency=medium
 
   * Correct ephemeral warning to include the full command for removal
diff --git a/debian/control b/debian/control
index f8a00bb..3d4e095 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Depends: cloud-init (>=0.7.3~bzr826-0ubuntu2),
          passwd (>=4.1.4.2),
          util-linux (>=2.0),
          ${misc:Depends},
-         ${python:Depends}
+         ${python3:Depends}
 Recommends: linux-image-extra-virtual
 Description: Windows Azure Linux Agent
  The Windows Azure Linux Agent supports the provisioning and running of Linux
diff --git a/debian/docs b/debian/docs
index c401623..ffb38b3 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,6 +1,6 @@
 debian/99-cloud-init-disable-diskprovisioning.conf
 NOTICE
-LICENSE-2.0.txt
+LICENSE.txt
 README.md
 MANIFEST
 Changelog
diff --git a/debian/patches/disable-auto-update.patch b/debian/patches/disable-auto-update.patch
new file mode 100644
index 0000000..166c6ec
--- /dev/null
+++ b/debian/patches/disable-auto-update.patch
@@ -0,0 +1,9 @@
+--- a/config/ubuntu/waagent.conf
++++ b/config/ubuntu/waagent.conf
+@@ -82,5 +82,5 @@
+ # OS.EnableRDMA=y
+ 
+ # Enable or disable self-update, default is enabled
+-AutoUpdate.Enabled=y
++AutoUpdate.Enabled=n
+ AutoUpdate.GAFamily=Prod
diff --git a/debian/patches/disable_udev_overrides.patch b/debian/patches/disable_udev_overrides.patch
index e0bb607..7c344d0 100644
--- a/debian/patches/disable_udev_overrides.patch
+++ b/debian/patches/disable_udev_overrides.patch
@@ -10,28 +10,3 @@
  VarLibDhcpDirectories = ["/var/lib/dhclient", "/var/lib/dhcpcd", "/var/lib/dhcp"]
  EtcDhcpClientConfFiles = ["/etc/dhcp/dhclient.conf", "/etc/dhcp3/dhclient.conf"]
  global LibDir
---- a/azurelinuxagent/distro/ubuntu/osutil.py
-+++ b/azurelinuxagent/distro/ubuntu/osutil.py
-@@ -44,6 +44,12 @@
-     def start_agent_service(self):
-         return shellutil.run("service walinuxagent start", chk_err=False)
- 
-+    def remove_rules_files(self, rules_files=""):
-+        pass
-+
-+    def restore_rules_files(self, rules_files=""):
-+        pass
-+
- class Ubuntu12OSUtil(Ubuntu14OSUtil):
-     def __init__(self):
-         super(Ubuntu12OSUtil, self).__init__()
-@@ -67,9 +73,3 @@
-     def __init__(self):
-         super(UbuntuSnappyOSUtil, self).__init__()
-         self.conf_file_path = '/apps/walinuxagent/current/waagent.conf'
--
--    def remove_rules_files(self, rules_files=""):
--        pass
--
--    def restore_rules_files(self, rules_files=""):
--        pass
diff --git a/debian/patches/fix_shebangs.patch b/debian/patches/fix_shebangs.patch
deleted file mode 100644
index 828b0f2..0000000
--- a/debian/patches/fix_shebangs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3n3n3
- #
- # Microsoft Azure Linux Agent setup.py
- #
---- a/bin/waagent
-+++ b/bin/waagent
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # Azure Linux Agent
- #
---- a/bin/waagent2.0
-+++ b/bin/waagent2.0
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # Azure Linux Agent
- #
diff --git a/debian/patches/series b/debian/patches/series
index a2f35e0..452e72a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
+disable-auto-update.patch
 cloud-init-default-cfg.patch
 disable_import_test.patch
 disable_udev_overrides.patch
-fix_shebangs.patch
diff --git a/debian/rules b/debian/rules
index 8ec7cb1..91d44ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,3 +22,6 @@ override_dh_installinit:
 override_dh_systemd_enable:
 	dh_systemd_enable --name walinuxagent walinuxagent.service
 	dh_systemd_enable --name ephemeral-disk-warning ephemeral-disk-warning.service
+
+override_dh_python3:
+	dh_python3 -O--buildsystem=pybuild --shebang "/usr/bin/env python3"