mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 22:21:40 +00:00
[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: Grant Likely <grant.likely@secretlab.ca> Acked-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
This commit is contained in:
parent
7f66c1fd03
commit
d474037334
@ -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 \
|
||||
skip=$overlay_dest seek=$system_reset_kernel \
|
||||
count=$overlay_size bs=1 2>&1)
|
||||
dd if="$ofile.bin" of="$ofile.bin" conv=notrunc \
|
||||
skip=$overlay_dest seek=$system_reset_kernel \
|
||||
count=$overlay_size bs=1
|
||||
|
||||
if [ $? -ne "0" ]; then
|
||||
echo $msg
|
||||
exit 1
|
||||
fi
|
||||
|
||||
msg=$(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
|
||||
dd if="$ofile.bin" of="$ofile.bin" conv=notrunc \
|
||||
skip=$system_reset_overlay seek=$overlay_dest \
|
||||
count=$overlay_size bs=1
|
||||
|
||||
gzip --force -9 --stdout "$ofile.bin" > "$object/otheros.bld"
|
||||
;;
|
||||
|
Loading…
Reference in New Issue
Block a user