diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/chroot-installation.sh | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/bin/chroot-installation.sh b/bin/chroot-installation.sh index c2a2bc61..11a27da5 100755 --- a/bin/chroot-installation.sh +++ b/bin/chroot-installation.sh @@ -49,24 +49,24 @@ cleanup_all() { } execute_ctmpfile() { - #set -x + set -x chmod +x $CTMPFILE - sudo chroot $CHROOT_TARGET $TMPFILE - #set -o pipefail # see eg http://petereisentraut.blogspot.com/2010/11/pipefail.html - #if ! $(sudo chroot $CHROOT_TARGET $TMPFILE 2>&1 | tee $TMPLOG) ; then - # RESULT=$(egrep "Failed to fetch.*Unable to connect to" $TMPLOG || true) - # if [ ! -z "$RESULT" ] ; then - # echo - # echo "Trying to workaround temporarily failure fetching packages, trying again..." - # echo - # sudo chroot $CHROOT_TARGET $TMPFILE - # else - # exit 1 - # fi - #fi + #sudo chroot $CHROOT_TARGET $TMPFILE + set -o pipefail # see eg http://petereisentraut.blogspot.com/2010/11/pipefail.html + if ! $(sudo chroot $CHROOT_TARGET $TMPFILE 2>&1 | tee $TMPLOG) ; then + RESULT=$(egrep "Failed to fetch.*Unable to connect to" $TMPLOG || true) + if [ ! -z "$RESULT" ] ; then + echo + echo "Trying to workaround temporarily failure fetching packages, trying again..." + echo + sudo chroot $CHROOT_TARGET $TMPFILE + else + exit 1 + fi + fi rm $CTMPFILE - #set +o pipefail - #set +x + set +o pipefail + set +x echo "Debug: This should only be printed on success." } |