sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Export die() function

Browse Source 
I realised I'd been using die() in a few places assuming it was
available, but it wasn't exported.  I guess it didn't matter because
whatever was wrong, we were failing anyway :)

This exports the function to make it available to sub-processes, which
should remove the need to source it as done in several places.

Change-Id: I7b9a5a6db406e160099b6ed9fde80455ae227327
This commit is contained in:
Ian Wienand 2016-05-27 09:25:22 +10:00
parent f0b57d5efd
commit 7550d25db0
5 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
elements/base/extra-data.d/50-store-build-settings
View File

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

1
elements/local-config/extra-data.d/62-ssh-key
View File

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

1
elements/partitioning-sfdisk/block-device.d/10-partitioning-sfdisk
View File

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

1
elements/vm/block-device.d/10-partition
View File

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

3
lib/die
View File

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