Merge lp:~jtv/maas/bug-1050033 into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Fix “cp: cannot stat” errors in maas-import-ephemerals (as run by maas-import-pxe-files) after upgrade from Precise to Quantal.

The cause of the problem was that maas-import-ephemerals will install boot images from its iSCSI directories, but some of the pre-quantal boot images may have files “kernel” and “initrd,” which nowadays we call “linux” and “initrd.gz” respectively.

You may wonder why I'm blithely renaming initrd to initrd.gz, instead of compressing it. That's because behind the scenes, initrd is already a gzipped file.

Jeroen

[Julian Edwards (julian-edwards)]

Approved if you make $2 and $3 $1 and $2 respectively, and $3 becomes $1 for the more "traditional" ordering :)

review: Approve

[Jeroen T. Vermeulen (jtv)]

Done.

=== modified file 'scripts/maas-import-ephemerals'
--- scripts/maas-import-ephemerals	2012-10-02 16:59:29 +0000
+++ scripts/maas-import-ephemerals	2012-10-09 11:42:33 +0000
@@ -269,6 +269,27 @@
 }
 
 
+copy_first_available() {
+    # Copy file $1 or $2 (the first that is available) to destination $3.
+    local preferred_file="$1" alternate_file="$2" destination="$3"
+    local actual=""
+
+    if [ -f "${preferred_file}" ]; then
+        actual="${preferred_file}"
+    elif [ -f "${alternate_file}" ]; then
+        actual="${alternate_file}"
+    else
+        error "Could not copy to ${destination}."
+        error "Neither ${preferred_file} nor ${alternate_file} exists."
+        return 1
+    fi
+
+    cp -- "${actual}" "${destination}" ||
+        { error "Could not copy ${actual} to ${destination}."; return 1; }
+    return 0
+}
+
+
 install_tftp_image() {
     # Make image in directory $1, for architecture $2 and subarchitecture $3,
     # and OS release $4, available over TFTP for netbooting nodes.  Only the
@@ -280,11 +301,10 @@
     # deletes it.
     tmpdir="$(mktemp -d)"
 
-    for filename in linux initrd.gz
-    do
-        cp -- "$src/$filename" "$tmpdir/" ||
-            { error "cp of $filename from $src failed"; return 1; }
-    done
+    copy_first_available "$src/linux" "$src/kernel" "$tmpdir/linux" ||
+        return 1
+    copy_first_available "$src/initrd.gz" "$src/initrd" "$tmpdir/initrd.gz" ||
+        return 1
 
     local cmd out=""
     cmd=( maas-provision install-pxe-image