Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4740373 authored by Grant Likely's avatar Grant Likely Committed by Josh Boyer
Browse files

[POWERPC] bootwrapper: Bail from script if any command fails 



Add the 'set -e' command to the wrapper script so that if any command
fails then the script will automatically exit

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarJosh Boyer <jwboyer@linux.vnet.ibm.com>
parent 7f66c1fd

arch/powerpc/boot/wrapper

+10 −17
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ 
#		(default ./arch/powerpc/boot)

# -W dir	specify working directory for temporary files (default .)



# Stop execution if any command fails

set -e



# Allow for verbose output

if [ "$V" = 1 ]; then

    set -x
@@ -116,7 +119,7 @@ if [ -n "$dts" ]; then 
    if [ -z "$dtb" ]; then

	dtb="$platform.dtb"

    fi

    dtc -O dtb -o "$dtb" -b 0 -V 16 "$dts" || exit 1

    dtc -O dtb -o "$dtb" -b 0 -V 16 "$dts"

fi



if [ -z "$kernel" ]; then
@@ -287,23 +290,13 @@ ps3) 


    rm -f "$object/otheros.bld"



    msg=$(dd if="$ofile.bin" of="$ofile.bin" conv=notrunc \

    dd if="$ofile.bin" of="$ofile.bin" conv=notrunc   \

        skip=$overlay_dest seek=$system_reset_kernel  \

        count=$overlay_size bs=1 2>&1)



    if [ $? -ne "0" ]; then

       echo $msg

       exit 1

    fi

        count=$overlay_size bs=1



    msg=$(dd if="$ofile.bin" of="$ofile.bin" conv=notrunc \

    dd if="$ofile.bin" of="$ofile.bin" conv=notrunc   \

        skip=$system_reset_overlay seek=$overlay_dest \

        count=$overlay_size bs=1 2>&1)



    if [ $? -ne "0" ]; then

       echo $msg

       exit 2

    fi

        count=$overlay_size bs=1



    gzip --force -9 --stdout "$ofile.bin" > "$object/otheros.bld"

    ;;