diff -Nru open-iscsi-2.0.874/debian/changelog open-iscsi-2.0.874/debian/changelog
--- open-iscsi-2.0.874/debian/changelog	2018-12-05 16:28:12.000000000 +0000
+++ open-iscsi-2.0.874/debian/changelog	2018-12-09 22:29:20.000000000 +0000
@@ -1,3 +1,13 @@
+open-iscsi (2.0.874-5ubuntu13) disco; urgency=medium
+
+  [ Robert C Jennings & Dimitri John Ledkov ]
+  * If iscsi root was requested, but no iscsi devices were mounted, remove
+    the initramfs interfaces stamp file. Meaning, that on shutdown there
+    is no 30s delay, whilst trying to re-establish iscsi login to perform
+    a logout. LP: #1800681
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Sun, 09 Dec 2018 22:29:20 +0000
+
 open-iscsi (2.0.874-5ubuntu12) disco; urgency=medium
 
   [Scott Moser]
diff -Nru open-iscsi-2.0.874/debian/extra/initramfs.local-top open-iscsi-2.0.874/debian/extra/initramfs.local-top
--- open-iscsi-2.0.874/debian/extra/initramfs.local-top	2018-12-05 16:28:12.000000000 +0000
+++ open-iscsi-2.0.874/debian/extra/initramfs.local-top	2018-12-09 22:29:01.000000000 +0000
@@ -381,4 +381,19 @@
 	done
 fi
 
+# Remove the interface file if no disks are present
+if [ -f /run/initramfs/open-iscsi.interface ] ; then
+	found=0
+	for disk in /dev/disk/by-path/*-iscsi-*; do
+		if ! "$(readlink -f "$disk")" ; then
+			continue
+		fi
+		found=1
+		break;
+	done
+	if [ $found = 0 ] ; then
+		rm /run/initramfs/open-iscsi.interface
+	fi
+fi
+
 exit 0