Merge ~smoser/ubuntu/+source/open-iscsi:bug/1807978-iscsi-lvm-cosmic into ubuntu/+source/open-iscsi:ubuntu/cosmic-devel

[Scott Moser]

debian/iscsi-disk.rules: append to SYSTEMD_WANTS, rather than truncate.

Previous version of this udev rule did
 ENV{SYSTEMD_WANTS}="iscsid.service

That would truncate the SYSTEMD_WANTS for the device. The problem
was exposed when we had LVM devices on top of an iscsi device.

LP: #1807978
(cherry picked from commit e28d73695da20ee3e4401bb254778ce8e576583b)

see commit message

[Steve Langasek (vorlon)]

review: Approve

[Scott Moser (smoser)]

I've just uploaded to cosmic.

diff --git a/debian/changelog b/debian/changelog
index 139c134..26bbd61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+open-iscsi (2.0.874-5ubuntu9.3) cosmic; urgency=medium
+
+  * debian/iscsi-disk.rules: Fix bug with LVM on top of iscsi devices.
+    (LP: #1807978)
+
+ -- Scott Moser <[e-mail]>  Tue, 11 Dec 2018 19:10:50 -0500
+
 open-iscsi (2.0.874-5ubuntu9.2) cosmic; urgency=medium
 
   [Scott Moser]
diff --git a/debian/iscsi-disk.rules b/debian/iscsi-disk.rules
index e0ef836..784072b 100644
--- a/debian/iscsi-disk.rules
+++ b/debian/iscsi-disk.rules
@@ -1,3 +1,3 @@
 # When iscsi disks are present, iscsid.service should be running. LP: #1802354
 # ID_PATH looks like ip-<ipv4-dotted-quad>:<port>-iscsi-<target>-lun-<lun>
-SUBSYSTEM=="block", ACTION=="add", ENV{ID_PATH}=="*-iscsi-*", ENV{SYSTEMD_WANTS}="iscsid.service"
+SUBSYSTEM=="block", ACTION=="add", ENV{ID_PATH}=="*-iscsi-*", ENV{SYSTEMD_WANTS}+="iscsid.service"