From 8e62ffba245e7db85c9a3d879b52dc6c5bbb9495 Mon Sep 17 00:00:00 2001
From: James Bromberger <james@rcpt.to>
Date: Sat, 9 Nov 2013 09:19:40 +0000
Subject: [PATCH 1/4] Remove temp file from sed plugin, adjust official debian
 manifset file.

---
 plugins/sed/temp | 31 -------------------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 plugins/sed/temp

diff --git a/plugins/sed/temp b/plugins/sed/temp
deleted file mode 100644
index 0f9f99a..0000000
--- a/plugins/sed/temp
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"$schema": "http://json-schema.org/draft-04/schema#",
-	"title": "Backports setup and package install",
-	"type": "object",
-	"properties": {
-		"plugins": {
-			"type": "object",
-			"properties": {
-				"sed": {
-					"type": "array",
-					"items": {
-						"type": "object",
-						"properties": {
-							"file": {
-								"type": "string"
-							},
-							"find": {
-								"type": "string"
-							},
-							"replace": {
-								"type": "string"
-							}
-						}
-					}
-				}
-			},
-			"required": ["sed"]
-		}
-	},
-	"required": ["plugins"]
-}

From 8582edbf7a1d10a959f08756c9276e331d0a1c1a Mon Sep 17 00:00:00 2001
From: James Bromberger <james@rcpt.to>
Date: Sat, 9 Nov 2013 09:22:30 +0000
Subject: [PATCH 2/4] Update official Debian manifest file.

---
 manifests/ec2-ebs-debian-official.manifest.json | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/manifests/ec2-ebs-debian-official.manifest.json b/manifests/ec2-ebs-debian-official.manifest.json
index 6292fe5..730c801 100644
--- a/manifests/ec2-ebs-debian-official.manifest.json
+++ b/manifests/ec2-ebs-debian-official.manifest.json
@@ -25,15 +25,26 @@
 		"partitions": {
 			"type": "none",
 			"root": {
-				"size":       1024,
+				"size":       8192,
 				"filesystem": "ext4"
 			}
 		}
 	},
 	"plugins": {
-		"admin_user": {
+		"backports": {
 			"enabled": true,
-			"username": "admin"
+			"packages": [ "cloud-init" ]
+		},
+		"user_packages": {
+			"enabled": true,
+			"repo": [ "sudo" ],
+			"local": []
+		},
+		"sed": {
+			"enabled": true,
+			"file": "etc/cloud/cloud.cfg",
+			"find": "^     name: debian$",
+			"replace": "     name: admin\n     sudo: ALL=(ALL) NOPASSWD:ALL\n     shell: /bin/bash"
 		}
 	}
 }

From 8a215afac228d1d5f7435c66c6ab19003e5c418f Mon Sep 17 00:00:00 2001
From: James Bromberger <james@rcpt.to>
Date: Sat, 9 Nov 2013 13:33:38 +0000
Subject: [PATCH 3/4] Bug fix sed plugin, remove debug from tasks.py.

---
 plugins/sed/__init__.py | 3 +--
 plugins/sed/tasks.py    | 4 ----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/plugins/sed/__init__.py b/plugins/sed/__init__.py
index e020769..c754084 100644
--- a/plugins/sed/__init__.py
+++ b/plugins/sed/__init__.py
@@ -2,8 +2,7 @@
 
 def tasks(tasklist, manifest):
 	import tasks
-	tasklist.add(tasks.DoSeds())
-
+	tasklist.add(tasks.DoSeds)
 
 def validate_manifest(data, schema_validate):
 	from os import path
diff --git a/plugins/sed/tasks.py b/plugins/sed/tasks.py
index b197121..49f1d4b 100644
--- a/plugins/sed/tasks.py
+++ b/plugins/sed/tasks.py
@@ -12,8 +12,4 @@ class DoSeds(Task):
         def run(self, info):
 
 			chroot_path = os.path.join(info.root, info.manifest.plugins['sed']['file'])
-			print chroot_path
-			print info.manifest.plugins['sed']['file']
-			print info.manifest.plugins['sed']['find']
-			print info.manifest.plugins['sed']['replace']
 			sed_i(chroot_path, info.manifest.plugins['sed']['find'], info.manifest.plugins['sed']['replace'])

From b1f20ee1968acc7c6b8f37779eb995946a3c253c Mon Sep 17 00:00:00 2001
From: James Bromberger <james@rcpt.to>
Date: Sat, 9 Nov 2013 14:17:24 +0000
Subject: [PATCH 4/4] Add in i386 manifest.

---
 ...ebs-debian-official-i386-pvm.manifest.json | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 manifests/ec2-ebs-debian-official-i386-pvm.manifest.json

diff --git a/manifests/ec2-ebs-debian-official-i386-pvm.manifest.json b/manifests/ec2-ebs-debian-official-i386-pvm.manifest.json
new file mode 100644
index 0000000..72f03db
--- /dev/null
+++ b/manifests/ec2-ebs-debian-official-i386-pvm.manifest.json
@@ -0,0 +1,50 @@
+{
+	"provider":       "ec2",
+	"virtualization": "pvm",
+	"credentials":    {
+		// "access-key": null,
+		// "secret-key": null
+	},
+
+	"bootstrapper": {
+		"workspace": "/target"
+	},
+	"image": {
+		"name":        "debian-{release}-{architecture}-{virtualization}-{%y}{%m}{%d}",
+		"description": "Debian {release} {architecture} AMI ({virtualization})"
+	},
+	"system": {
+		"release":      "wheezy",
+		"architecture": "i386",
+		"timezone":     "UTC",
+		"locale":       "en_US",
+		"charmap":      "UTF-8"
+	},
+	"volume": {
+		"backing": "ebs",
+		"partitions": {
+			"type": "none",
+			"root": {
+				"size":       8192,
+				"filesystem": "ext4"
+			}
+		}
+	},
+	"plugins": {
+		"backports": {
+			"enabled": true,
+			"packages": [ "cloud-init" ]
+		},
+		"user_packages": {
+			"enabled": true,
+			"repo": [ "sudo" ],
+			"local": []
+		},
+		"sed": {
+			"enabled": true,
+			"file": "etc/cloud/cloud.cfg",
+			"find": "^     name: debian$",
+			"replace": "     name: admin\n     sudo: ALL=(ALL) NOPASSWD:ALL\n     shell: /bin/bash"
+		}
+	}
+}