diff -Nru cloud-utils-0.25/debian/changelog cloud-utils-0.25/debian/changelog --- cloud-utils-0.25/debian/changelog 2012-02-19 20:26:32.000000000 +0000 +++ cloud-utils-0.25/debian/changelog 2012-02-22 20:52:16.000000000 +0000 @@ -1,3 +1,9 @@ +cloud-utils (0.25-0ubuntu3) precise; urgency=low + + * growpart: allow output of failed sfdisk to get to user + + -- Scott Moser Wed, 22 Feb 2012 15:49:34 -0500 + cloud-utils (0.25-0ubuntu2) precise; urgency=low * cloud-publish-image: fix issue if ramdisk=none diff -Nru cloud-utils-0.25/debian/patches/growpart-show-sfdisk-error-output.patch cloud-utils-0.25/debian/patches/growpart-show-sfdisk-error-output.patch --- cloud-utils-0.25/debian/patches/growpart-show-sfdisk-error-output.patch 1970-01-01 00:00:00.000000000 +0000 +++ cloud-utils-0.25/debian/patches/growpart-show-sfdisk-error-output.patch 2012-02-22 20:46:12.000000000 +0000 @@ -0,0 +1,39 @@ +------------------------------------------------------------ +revno: 170 +committer: Scott Moser +branch nick: trunk +timestamp: Wed 2012-02-22 15:38:35 -0500 +message: + growpart: if sfdisk resize fails, send its output to stderr + + Previously, if sfdisk failed, its output was never shown to the + user. This was especially confusing because the restore output + *was* shown. + + See bug 937352 for fallout of this. There, the original console output + of the failed resize contained only the restore output, and confused + us in debugging. +diff: +=== modified file 'bin/growpart' +--- a/bin/growpart 2011-10-04 19:21:52 +0000 ++++ b/bin/growpart 2012-02-22 20:38:35 +0000 +@@ -112,7 +112,6 @@ + trap cleanup EXIT + + change_out=${TEMP_D}/change.out +-change_err=${TEMP_D}/change.err + dump_out=${TEMP_D}/dump.out + new_out=${TEMP_D}/new.out + dump_mod=${TEMP_D}/dump.mod +@@ -182,8 +181,10 @@ + fi + + sfdisk "${disk}" ${CHS} --force -O "${orig_bin}" \ +- < "${new_out}" > "${change_out}" 2> "${change_err}" || { ++ < "${new_out}" > "${change_out}" 2>&1 || { + DISK=${disk}; RESTORE_FROM="${orig_bin}"; ++ error "attempt to resize ${disk} failed. sfdisk output below:" ++ sed 's,^,| ,' "${change_out}" 1>&2 + fail "failed to resize" + } + changed "${change_info}" diff -Nru cloud-utils-0.25/debian/patches/series cloud-utils-0.25/debian/patches/series --- cloud-utils-0.25/debian/patches/series 2012-02-19 20:26:32.000000000 +0000 +++ cloud-utils-0.25/debian/patches/series 2012-02-22 20:45:54.000000000 +0000 @@ -1 +1,2 @@ fix-publish-image-ramdisk-none.patch +growpart-show-sfdisk-error-output.patch