Merge ~raharper/ubuntu/+source/open-iscsi:fix-iscsi-udev-systemd-wants-rule into ubuntu/+source/open-iscsi:ubuntu/disco

[Ryan Harper]

iscsi-disk.rules: append to SYSTEMD_WANTS to avoid clobbering other rules

When testing with LVM over iscsi block devices, it was found that
the iscsi-disk.rules file rule clobbers additional SYSTEMD_WANTS values
that may already have been set by other disk rules. Fix by appending
our rules to the the environment variable.

LP: #1807978

[Steve Langasek (vorlon)]

review: Approve

[Scott Moser (smoser)]

Sorry for duplicate work.

[ubuntu/disco-proposed] open-iscsi 2.0.874-5ubuntu14 (Accepted)

I uploaded that with the same change.

Also uploaded to cosmic and disco.

Unmerged commits

f23f8f6... by Ryan Harper on 2018-12-11

update debian/chagelog

cc93f03... by Ryan Harper on 2018-12-11

iscsi-disk.rules: append to SYSTEMD_WANTS to avoid clobbering other rules

When testing with LVM over iscsi block devices, it was found that
the iscsi-disk.rules file rule clobbers additional SYSTEMD_WANTS values
that may already have been set by other disk rules. Fix by appending
our rules to the the environment variable.

LP: #1807978

diff --git a/debian/changelog b/debian/changelog
index 07eb0d0..39788c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+open-iscsi (2.0.874-5ubuntu14) disco; urgency=medium
+
+  [Steve Langasek]
+  * d/iscsi-disk.rules: Append to SYSTEMD_WANTS variable to avoid clobbering
+    other values that may be present.  LP: #1807978
+
+ -- Ryan Harper <[e-mail]>  Tue, 11 Dec 2018 17:07:07 -0600
+
 open-iscsi (2.0.874-5ubuntu13) disco; urgency=medium
 
   [ Robert C Jennings & Dimitri John Ledkov ]
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"