diff -Nru open-iscsi-2.0.873+git0.3b4b4500/debian/changelog open-iscsi-2.0.873+git0.3b4b4500/debian/changelog
--- open-iscsi-2.0.873+git0.3b4b4500/debian/changelog	2017-02-16 20:47:58.000000000 +0000
+++ open-iscsi-2.0.873+git0.3b4b4500/debian/changelog	2017-05-08 10:03:44.000000000 +0000
@@ -1,3 +1,13 @@
+open-iscsi (2.0.873+git0.3b4b4500-14ubuntu18) artful; urgency=medium
+
+  * Let iscsid systemd job run in privileged containers but not in
+    unprivileged ones
+  * Start open-iscsi systemd job when either /etc/iscsi/nodes or
+    /sys/class/iscsi_session have content
+    Based on patch by Nish Aravamudan, thanks! (LP: #1576341)
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Mon, 08 May 2017 10:03:44 +0000
+
 open-iscsi (2.0.873+git0.3b4b4500-14ubuntu17) zesty; urgency=medium
 
   * debian/tests:
diff -Nru open-iscsi-2.0.873+git0.3b4b4500/debian/iscsid.service open-iscsi-2.0.873+git0.3b4b4500/debian/iscsid.service
--- open-iscsi-2.0.873+git0.3b4b4500/debian/iscsid.service	2017-02-16 20:47:58.000000000 +0000
+++ open-iscsi-2.0.873+git0.3b4b4500/debian/iscsid.service	2017-05-08 10:00:44.000000000 +0000
@@ -7,6 +7,7 @@
 DefaultDependencies=no
 Conflicts=shutdown.target
 Before=shutdown.target
+ConditionVirtualization=!private-users
 
 [Service]
 Type=forking
diff -Nru open-iscsi-2.0.873+git0.3b4b4500/debian/open-iscsi.service open-iscsi-2.0.873+git0.3b4b4500/debian/open-iscsi.service
--- open-iscsi-2.0.873+git0.3b4b4500/debian/open-iscsi.service	2017-02-16 20:47:58.000000000 +0000
+++ open-iscsi-2.0.873+git0.3b4b4500/debian/open-iscsi.service	2017-05-08 10:00:27.000000000 +0000
@@ -7,7 +7,10 @@
 DefaultDependencies=no
 Conflicts=shutdown.target
 Before=shutdown.target
-ConditionVirtualization=!container
+# Must have some pre-defined targets to login to
+ConditionDirectoryNotEmpty=|/etc/iscsi/nodes
+# or have a session to use via iscsid
+ConditionDirectoryNotEmpty=|/sys/class/iscsi_session
 
 [Service]
 Type=oneshot