iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add more stack traces, other minor changes
[automated-distro-installer]
/
dsfull
diff --git
a/dsfull
b/dsfull
index 417635014c3d8413649d7c03bb9c2ac9b92e7163..29946f39804b3cfccbc7378fba17656167d207a0 100755
(executable)
--- a/
dsfull
+++ b/
dsfull
@@
-13,9
+13,7
@@
# See the License for the specific language governing permissions and
# limitations under the License.
# See the License for the specific language governing permissions and
# limitations under the License.
-set -eE -o pipefail
-cleanup() { :; }
-trap 'cleanup; echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
reboot=true
if [[ $1 == -r ]]; then
reboot=true
if [[ $1 == -r ]]; then
@@
-73,7
+71,7
@@
if $kexec; then
e myfai-chboot $host
e fai-kexec $host ||:
else
e myfai-chboot $host
e fai-kexec $host ||:
else
- cleanup() { pxe-server; }
+ cleanup() { pxe-server; }
; _errcatch_cleanup=cleanup
e pxe-server $host fai
if $reboot; then
e pxe-server $host fai
if $reboot; then
@@
-82,7
+80,7
@@
else
fi
e pxe-server -a
fi
e pxe-server -a
- cleanup() { :; }
+ unset _errcatch_cleanup
fi
error=true
fi
error=true