From 00a26f7e5aa13f4e640d5b5543c604c72cfde1b8 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Mon, 28 Apr 2014 23:45:57 +0200 Subject: g-i: immediatly abort if installation is hanging, do not try to boot that system... --- bin/g-i-installation.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index 0994b127..70136286 100755 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -856,9 +856,14 @@ monitor_system() { if [ $PIXEL -lt 400 ] ; then # unless TRIGGER_MODE is empty, matching images means its over if [ ! -z "$TRIGGER_MODE" ] ; then - echo "Warning: snapshot_${PRINTF_NR}.ppm snapshot_${PRINTF_OLD}.ppm match, ending installation." + echo "Warning: snapshot_${PRINTF_NR}.ppm snapshot_${PRINTF_OLD}.ppm match or almost match, ending installation." ls -la snapshot_${PRINTF_NR}.ppm snapshot_${PRINTF_OLD}.ppm - figlet "Mode $MODE hangs." + if [ "$MODE" = "install" ] ; then + echo "System in $MODE mode is hanging, let's end this." + # hanging install = broken install + exit 1 + fi + echo "System in $MODE mode is hanging, moving on." break else # this is only reached once in rescue mode -- cgit v1.2.3-70-g09d2