From 49475292d76283fc85f0e2fa4da7b9f4e6e43c0d Mon Sep 17 00:00:00 2001
From: Jimmy Kaplowitz <jkaplowitz@google.com>
Date: Sat, 10 May 2014 21:10:02 -0700
Subject: [PATCH] Split GCE manifest into regular & backports

Some people want the security team-supported 3.2 kernel, while others
want the better performance of the backports kernel. Both flavors are
currently provided in the Google Compute Engine debian-cloud project.

Also add OpenSSH to the backports flavor, for parity with the current
GCE backports image based on build-debian-cloud. This backport is
included for performance reasons, in line with the purpose of that image
flavor, and as discussed on the debian-cloud list.
---
 manifests/gce-backports.manifest.json | 53 +++++++++++++++++++++++++++
 manifests/gce.manifest.json           | 11 +-----
 2 files changed, 54 insertions(+), 10 deletions(-)
 create mode 100644 manifests/gce-backports.manifest.json

diff --git a/manifests/gce-backports.manifest.json b/manifests/gce-backports.manifest.json
new file mode 100644
index 0000000..1334ab2
--- /dev/null
+++ b/manifests/gce-backports.manifest.json
@@ -0,0 +1,53 @@
+{
+	"provider": "gce",
+	"bootstrapper": {
+		"workspace":      "/target"
+	},
+	"image": {
+		"name":        "disk",
+		"description": "Debian {system.release} {system.architecture}"
+	},
+	"system": {
+		"release":      "wheezy",
+		"sections":     ["main", "contrib", "non-free"],
+		"architecture": "amd64",
+		"bootloader":   "grub",
+		"timezone":     "UTC",
+		"locale":       "en_US",
+		"charmap":      "UTF-8"
+	},
+	"packages": {
+		"mirror": "http://gce_debian_mirror.storage.googleapis.com/",
+		"preferences": {
+			"backport-kernel": [
+			{
+				"package": "linux-image-* initramfs-tools",
+				"pin": "release n=wheezy-backports",
+				"pin-priority": 500
+			}
+			],
+			"backport-ssh": [
+			{
+				"package": "init-system-helpers openssh-sftp-server openssh-client openssh-server",
+				"pin": "release n=wheezy-backports",
+				"pin-priority": 500
+			}
+			]
+		}
+	},
+	"plugins": {
+		"ntp": {
+			"servers": ["metadata.google.internal"]
+		}
+	},
+	"volume": {
+		"backing": "raw",
+		"partitions": {
+			"type": "msdos",
+			"root": {
+				"size":       "10GiB",
+				"filesystem": "ext4"
+			}
+		}
+	}
+}
diff --git a/manifests/gce.manifest.json b/manifests/gce.manifest.json
index 2c6fdad..2f2bdb6 100644
--- a/manifests/gce.manifest.json
+++ b/manifests/gce.manifest.json
@@ -17,16 +17,7 @@
 		"charmap":      "UTF-8"
 	},
 	"packages": {
-		"mirror": "http://gce_debian_mirror.storage.googleapis.com/",
-		"preferences": {
-			"backport-kernel": [
-			{
-				"package": "linux-image-* initramfs-tools",
-				"pin": "release n=wheezy-backports",
-				"pin-priority": 500
-			}
-			]
-		}
+		"mirror": "http://gce_debian_mirror.storage.googleapis.com/"
 	},
 	"plugins": {
 		"ntp": {