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

[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
...@@ -21,6 +21,9 @@ ...@@ -21,6 +21,9 @@
# (default ./arch/powerpc/boot) # (default ./arch/powerpc/boot)
# -W dir specify working directory for temporary files (default .) # -W dir specify working directory for temporary files (default .)
# Stop execution if any command fails
set -e
# Allow for verbose output # Allow for verbose output
if [ "$V" = 1 ]; then if [ "$V" = 1 ]; then
set -x set -x
...@@ -116,7 +119,7 @@ if [ -n "$dts" ]; then ...@@ -116,7 +119,7 @@ if [ -n "$dts" ]; then
if [ -z "$dtb" ]; then if [ -z "$dtb" ]; then
dtb="$platform.dtb" dtb="$platform.dtb"
fi fi
dtc -O dtb -o "$dtb" -b 0 -V 16 "$dts" || exit 1 dtc -O dtb -o "$dtb" -b 0 -V 16 "$dts"
fi fi
if [ -z "$kernel" ]; then if [ -z "$kernel" ]; then
...@@ -287,23 +290,13 @@ ps3) ...@@ -287,23 +290,13 @@ ps3)
rm -f "$object/otheros.bld" 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 \ skip=$overlay_dest seek=$system_reset_kernel \
count=$overlay_size bs=1 2>&1) count=$overlay_size bs=1
if [ $? -ne "0" ]; then
echo $msg
exit 1
fi
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 \ skip=$system_reset_overlay seek=$overlay_dest \
count=$overlay_size bs=1 2>&1) count=$overlay_size bs=1
if [ $? -ne "0" ]; then
echo $msg
exit 2
fi
gzip --force -9 --stdout "$ofile.bin" > "$object/otheros.bld" gzip --force -9 --stdout "$ofile.bin" > "$object/otheros.bld"
;; ;;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment