From 0212db733ddcdcba09013a08f56c8be89be22ef0 Mon Sep 17 00:00:00 2001
From: "Stephen A. Zarkos" <stephen.zarkos@microsoft.com>
Date: Wed, 5 Aug 2015 22:20:14 +0000
Subject: [PATCH] Updates to Azure image creation.

 - Wheezy images use wheezy-backports kernel by default
 - Change Wheezy image to use single partition
 - Update WALinuxAgent to use 2.0.14
---
 bootstrapvz/providers/azure/__init__.py |  3 ++-
 manifests/examples/azure/jessie.yml     |  8 ++++++--
 manifests/examples/azure/wheezy.yml     | 18 ++++++++++++------
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/bootstrapvz/providers/azure/__init__.py b/bootstrapvz/providers/azure/__init__.py
index 5081448..7d2249d 100644
--- a/bootstrapvz/providers/azure/__init__.py
+++ b/bootstrapvz/providers/azure/__init__.py
@@ -15,7 +15,8 @@ def validate_manifest(data, validator, error):
 
 def resolve_tasks(taskset, manifest):
 	taskset.update(task_groups.get_standard_groups(manifest))
-	taskset.update([tasks.packages.DefaultPackages,
+	taskset.update([apt.AddBackports,
+	                tasks.packages.DefaultPackages,
 	                loopback.AddRequiredCommands,
 	                loopback.Create,
 	                initd.InstallInitScripts,
diff --git a/manifests/examples/azure/jessie.yml b/manifests/examples/azure/jessie.yml
index a06114b..43ee5f2 100644
--- a/manifests/examples/azure/jessie.yml
+++ b/manifests/examples/azure/jessie.yml
@@ -2,7 +2,7 @@
 provider:
   name: azure
   waagent:
-    version: 2.0.13
+    version: 2.0.14
 bootstrapper:
   mirror: http://httpredir.debian.org/debian/
   workspace: /target
@@ -23,7 +23,11 @@ volume:
     root:
       filesystem: ext4
       size: 10GiB
-packages: {}
+packages:
+  components:
+  - main
+  - contrib
+  - non-free
 plugins:
   ntp:
     servers:
diff --git a/manifests/examples/azure/wheezy.yml b/manifests/examples/azure/wheezy.yml
index 558d666..623265e 100644
--- a/manifests/examples/azure/wheezy.yml
+++ b/manifests/examples/azure/wheezy.yml
@@ -2,7 +2,7 @@
 provider:
   name: azure
   waagent:
-    version: 2.0.4
+    version: 2.0.14
 bootstrapper:
   mirror: http://httpredir.debian.org/debian/
   workspace: /target
@@ -20,13 +20,19 @@ volume:
   backing: raw
   partitions:
     type: msdos
-    boot:
-      filesystem: ext2
-      size: 32MiB
     root:
       filesystem: ext4
-      size: 7GiB
-packages: {}
+      size: 10GiB
+packages:
+  components:
+  - main
+  - contrib
+  - non-free
+  preferences:
+    backport-kernel:
+    - package: linux-image-* initramfs-tools
+      pin: release n=wheezy-backports
+      pin-priority: 500
 plugins:
   ntp:
     servers: