upstream 00f2ea2b8 as of 2018-09-02

[automated-distro-installer] / fai / config / class / 41-warning.sh

diff --git a/fai/config/class/41-warning.sh b/fai/config/class/41-warning.sh
index b3da9feb22135ab30d5939f905b9a421a5b75716..e9f9ec5b396bffc40147e1fed3ffde799e4dd947 100755 (executable)
--- a/fai/config/class/41-warning.sh
+++ b/fai/config/class/41-warning.sh
@@ -3,16 +3,26 @@
 if [ X$FAI_ACTION = Xinstall -o X$FAI_ACTION = X ]; then
     :
 else
-    return
+    return 0
 fi
 if [ X$action = Xdirinstall ]; then
-    return
+    return 0
 fi
 
 grep -q INSTALL $LOGDIR/FAI_CLASSES || return 0
 [ "$flag_menu" ] || return 0
 
 out=$(tty)
+red=$(mktemp)
+echo 'screen_color = (CYAN,RED,ON)' > $red
 
-dialog --colors --clear --aspect 6 --title "FAI - Fully Automatic Installation" --trim \
+DIALOGRC=$red dialog --colors --clear --aspect 6 --title "FAI - Fully Automatic Installation" --trim \
                --msgbox "\n\n        If you continue,       \n   all your data on the disk   \n                               \n|\Zr\Z1       WILL BE DESTROYED     \Z0\Zn|\n\n" 0 0 1>$out
+
+# stop on any error, or if ESC was hit
+if [ $? -ne 0 ]; then
+    task_error 999
+fi
+
+rm $red
+unset red