launchpad-reviewers team mailing list archive

[Julian Edwards <julian.edwards@xxxxxxxxxxxxx>]

Julian Edwards has proposed merging lp:~julian-edwards/maas/enlist-url-fix into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1033416 in MAAS: "Enlisting new node gets pointed at non-existent commissioning image"
  https://bugs.launchpad.net/maas/+bug/1033416

For more details, see:
https://code.launchpad.net/~julian-edwards/maas/enlist-url-fix/+merge/118664

The maas-import-ephemeral script was creating images for the kernel and initrd with the wrong names.  Simple fix to sort that.
-- 
https://code.launchpad.net/~julian-edwards/maas/enlist-url-fix/+merge/118664
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~julian-edwards/maas/enlist-url-fix into lp:maas.

=== modified file 'scripts/maas-import-ephemerals'
--- scripts/maas-import-ephemerals	2012-08-03 16:36:26 +0000
+++ scripts/maas-import-ephemerals	2012-08-08 03:06:19 +0000
@@ -272,13 +272,13 @@
     mv "$img" "$wd/disk.img" ||
         { error "failed to move extracted image to $wd/disk.img"; return 1; }
 
-    [ -z "$kernel" ] || mv "$kernel" "$wd/kernel" ||
-        { error "failed to move extracted kernel to $wd/kernel"; return 1; }
-
-    [ -z "$initrd" ] || mv "$initrd" "$wd/initrd" ||
-        { error "failed to move extracted initrd to $wd/initrd"; return 1; }
-
-    rm -Rf "$exdir" || { error "failed to cleanup extract dir"; return 1; }
+    [ -z "$kernel" ] || mv "$kernel" "$wd/linux" ||
+        { error "failed to move extracted kernel to $wd/linux"; return 1; }
+
+    [ -z "$initrd" ] || mv "$initrd" "$wd/initrd.gz" ||
+        { error "failed to move extracted initrd to $wd/initrd.gz"; return 1; }
+
+    rm -Rf "$exdir" || { error "failed to cleanup extraction dir"; return 1; }
     { [ -z "$rmtar" ] || rm "$rmtar"; } ||
         { error "failed to remove temporary tarball $rmtar"; return 1; }