Merge "Use correct path when extracting tar.gz image"

This commit is contained in:
Jenkins 2014-06-19 22:47:39 +00:00 committed by Gerrit Code Review
commit f3939bf077

View File

@ -250,7 +250,7 @@ function upload_image {
xdir="$FILES/images/$IMAGE_NAME" xdir="$FILES/images/$IMAGE_NAME"
rm -Rf "$xdir"; rm -Rf "$xdir";
mkdir "$xdir" mkdir "$xdir"
tar -zxf $FILES/$IMAGE_FNAME -C "$xdir" tar -zxf $IMAGE -C "$xdir"
KERNEL=$(for f in "$xdir/"*-vmlinuz* "$xdir/"aki-*/image; do KERNEL=$(for f in "$xdir/"*-vmlinuz* "$xdir/"aki-*/image; do
[ -f "$f" ] && echo "$f" && break; done; true) [ -f "$f" ] && echo "$f" && break; done; true)
RAMDISK=$(for f in "$xdir/"*-initrd* "$xdir/"ari-*/image; do RAMDISK=$(for f in "$xdir/"*-initrd* "$xdir/"ari-*/image; do