Merge remote-tracking branch 'origin/pr/5'
* origin/pr/5: example fix 'bug, not using errtrace when using VERBOSE' qubesos/qubes-issues#1088
This commit is contained in:
commit
713726a5a9
@ -1,5 +1,9 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
|
if [ "$VERBOSE" -ge 2 -o "$DEBUG" == "1" ]; then
|
||||||
|
set -x
|
||||||
|
fi
|
||||||
|
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
# Configurations and Conditionals
|
# Configurations and Conditionals
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
@ -10,11 +14,7 @@ export LC_ALL=POSIX
|
|||||||
. ./builder_setup >/dev/null
|
. ./builder_setup >/dev/null
|
||||||
. ./umount_kill.sh >/dev/null
|
. ./umount_kill.sh >/dev/null
|
||||||
|
|
||||||
if [ "$VERBOSE" -ge 2 -o "$DEBUG" == "1" ]; then
|
set -e
|
||||||
set -x
|
|
||||||
else
|
|
||||||
set -e
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ $# -eq 0 ]; then
|
if [ $# -eq 0 ]; then
|
||||||
echo "usage $0 <clean_image_file> <template_name>"
|
echo "usage $0 <clean_image_file> <template_name>"
|
||||||
|
Loading…
Reference in New Issue
Block a user