Merge "Export die() function"

This commit is contained in:
Jenkins 2016-06-07 01:00:50 +00:00 committed by Gerrit Code Review
commit 13323c9495
5 changed files with 5 additions and 8 deletions

View File

@ -7,7 +7,6 @@ fi
set -eu
set -o pipefail
source $_LIB/die
[ -n "$TMP_HOOKS_PATH" ] || die "Temp hook path not set"
echo "$DIB_ENV" > $TMP_HOOKS_PATH/dib_environment

View File

@ -8,7 +8,6 @@ fi
set -eu
set -o pipefail
source $_LIB/die
[ -n "$TMP_HOOKS_PATH" ] || die "Temp hook path not set"
if [ -e ~/.ssh/authorized_keys ]; then

View File

@ -9,7 +9,6 @@ set -eu
set -o pipefail
# sanity checks
source $_LIB/die
[ -n "$IMAGE_BLOCK_DEVICE" ] || die "Image block device not set"
# execute sfdisk with the given partitioning schema

View File

@ -8,7 +8,6 @@ fi
set -eu
set -o pipefail
source $_LIB/die
[ -n "$IMAGE_BLOCK_DEVICE" ] || die "Image block device not set"
# Create 2 partitions for PPC, one for PReP boot and other for root

View File

@ -16,10 +16,11 @@
# Prints "message" and exits
# Usage: die "message"
function die() {
function die {
local exitcode=$?
set +o xtrace
echo $@
exit $exitcode
}
export -f die