new test if install should not be performed

install into / is forbidden, Beep only during initial installation
faiproject · Jul 18, 2016 · cec0021 · cec0021
1 parent 77e0c5e
commit cec0021
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/lib/subroutines b/lib/subroutines
@@ -359,14 +359,16 @@ task_action() {
     echo "FAI_ACTION: $FAI_ACTION"
     case $FAI_ACTION in
         install)
-            if [ $do_init_tasks -eq 0 ]; then
+            if [ $target = "/" ]; then
                 echo "Cowardly refusing to run a FAI installation on a running system."
                 return
             fi
             echo Performing FAI installation. All data may be overwritten!
-            echo -ne "\a"; sleep 1
-            echo -ne "\a"; sleep 1
-            echo  -e "\a"; sleep 5
+	    if [ $do_init_tasks -eq 1 ] ; then
+		echo -ne "\a"; sleep 1
+		echo -ne "\a"; sleep 1
+		echo  -e "\a"; sleep 5
+	    fi
             task install
             task faiend
             ;;