Merge lp:~blake-rouse/curtin/ppc64el-grub-ieee1275 into lp:~curtin-dev/curtin/trunk

[Blake Rouse]

grub-ieee1275 installation on ppc64el.

Provides support for curtin installation on ppc64el.

[Scott Moser (smoser)]

thanks.
this looks reasonable, except this:

$ sh -c 'mfunc() { local f=$(false); echo $?; }; mfunc;'
0

Ie, the 'local' declaration masks the return value so that:
local dpkg_arch=$(chroot "$mp" dpkg --print-architecture)

will always return 0.

local dpkg_arch=""
dpkg_arch=$(chroot "$mp" dpkg --print-architecture)

[lp:~blake-rouse/curtin/ppc64el-grub-ieee1275]

128. By Blake Rouse on 2014-04-15

Fix local variable.

[Blake Rouse (blake-rouse)]

Fixed!

[lp:~blake-rouse/curtin/ppc64el-grub-ieee1275]

129. By Blake Rouse on 2014-04-21

Fix invalid return code for dpkg_arch.

=== modified file 'helpers/common'
--- helpers/common	2014-04-10 18:56:53 +0000
+++ helpers/common	2014-04-21 16:04:07 +0000
@@ -301,16 +301,22 @@
     fi
     [ -b $mp_dev ] || { error "$mp_dev is not a block device!"; return 1; }
 
+    # get dpkg arch
+    local dpkg_arch=""
+    dpkg_arch=$(chroot "$mp" dpkg --print-architecture)
+    r=$?
+    if [ $r -ne 0 ]; then
+        error "failed to get dpkg architecture"
+        return 1;
+    fi
+
     # set correct grub package
     local grub_name="grub-pc"
     local grub_target="i386-pc"
-    if [ "$uefi" -ge 1 ]; then
-        dpkg_arch=$(chroot "$mp" dpkg --print-architecture)
-        r=$?
-        if [ $r -ne 0 -a $r -ne 1 ]; then
-            error "failed to get dpkg architecture"
-            return 1;
-        fi
+    if [ "$dpkg_arch" = "ppc64el" ]; then
+        grub_name="grub-ieee1275"
+        grub_target="powerpc-ieee1275"
+    elif [ "$uefi" -ge 1 ]; then
         grub_name="grub-efi-$dpkg_arch"
         if [ "$dpkg_arch" = "amd64" ]; then
             grub_target="x86_64-efi"