diff -Nru cloud-utils-0.25/debian/changelog cloud-utils-0.25/debian/changelog
--- cloud-utils-0.25/debian/changelog	2012-02-16 20:36:17.000000000 +0000
+++ cloud-utils-0.25/debian/changelog	2012-02-19 20:26:32.000000000 +0000
@@ -1,3 +1,10 @@
+cloud-utils (0.25-0ubuntu2) precise; urgency=low
+
+  * cloud-publish-image: fix issue if ramdisk=none
+    this fixes cloud-publish-tarball for no-ramdisk tarballs
+
+ -- Scott Moser <smoser@ubuntu.com>  Sun, 19 Feb 2012 15:18:26 -0500
+
 cloud-utils (0.25-0ubuntu1) precise; urgency=low
 
   * New upstream release.
diff -Nru cloud-utils-0.25/debian/patches/fix-publish-image-ramdisk-none.patch cloud-utils-0.25/debian/patches/fix-publish-image-ramdisk-none.patch
--- cloud-utils-0.25/debian/patches/fix-publish-image-ramdisk-none.patch	1970-01-01 00:00:00.000000000 +0000
+++ cloud-utils-0.25/debian/patches/fix-publish-image-ramdisk-none.patch	2012-02-19 20:26:32.000000000 +0000
@@ -0,0 +1,28 @@
+------------------------------------------------------------
+revno: 169
+committer: Scott Moser <smoser@ubuntu.com>
+branch nick: trunk
+timestamp: Sun 2012-02-19 09:51:01 -0500
+message:
+  fix issue if ramdisk == "none"
+  
+  If ramdisk is given as 'none', then the loader-kernel check was
+  trying to describe-images of 'none', which would fail.
+  
+  cloud-publish-tarball was broken for any tarball without a ramdisk as a result.
+diff:
+=== modified file 'bin/cloud-publish-image'
+--- a/bin/cloud-publish-image	2011-10-28 12:09:53 +0000
++++ b/bin/cloud-publish-image	2012-02-19 14:51:01 +0000
+@@ -280,7 +280,10 @@
+ 	aki_arch=""; ari_arch="";
+ 	# if kernel is given, check that its arch matches the register arch
+ 	aki_arch=""; ari_arch="";
+-	${EC2PRE}describe-images "$kernel" "$ramdisk" > "${TMPD}/kernel.info" ||
++	
++	[ "$ramdisk" = "none" ] && _ramdisk="" || _ramdisk="$ramdisk"
++
++	${EC2PRE}describe-images "$kernel" $_ramdisk > "${TMPD}/kernel.info" ||
+ 		fail "failed to describe kernel ${kernel}"
+ 	aki_arch=$(awk '-F\t' '$1 == "IMAGE" && $2 == id { print $8 }' \
+ 		"id=$kernel" "$TMPD/kernel.info") && [ -n "$aki_arch" ] ||
diff -Nru cloud-utils-0.25/debian/patches/series cloud-utils-0.25/debian/patches/series
--- cloud-utils-0.25/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ cloud-utils-0.25/debian/patches/series	2012-02-19 20:26:32.000000000 +0000
@@ -0,0 +1 @@
+fix-publish-image-ramdisk-none.patch