add test if $dirs is empty, cleanup PID file of fai

faiproject · Sep 13, 2016 · 053ef62 · 053ef62
1 parent e9b8414
commit 053ef62
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/bin/fai-diskimage b/bin/fai-diskimage
@@ -27,9 +27,16 @@ cleanup() {
     for dir in $(mount | awk '{print $3}'| grep $mnt | sort -r); do
 	dirs+=" $dir"
     done
-    umount $dirs
+    [ -n "$dirs" ] && umount $dirs
     losetup -d $loop
     rm -rf $mnt
+    if [ -f /var/run/fai/FAI_INSTALLATION_IN_PROGRESS ]; then
+	if pgrep -F /var/run/fai/FAI_INSTALLATION_IN_PROGRESS; then
+	    :
+	else
+	    rm /var/run/fai/FAI_INSTALLATION_IN_PROGRESS
+	fi
+    fi
 }
 
 usage() {