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

Proposed by Ryan Harper on 2018-12-11
Status: Rejected
Rejected by: Scott Moser on 2018-12-12
Proposed branch: ~raharper/ubuntu/+source/open-iscsi:fix-iscsi-udev-systemd-wants-rule
Merge into: ubuntu/+source/open-iscsi:ubuntu/disco
Diff against target: 25 lines (+9/-1)
2 files modified
debian/changelog (+8/-0)
debian/iscsi-disk.rules (+1/-1)
Reviewer Review Type Date Requested Status
Steve Langasek (community) 2018-12-11 Approve on 2018-12-11
Review via email: mp+360760@code.launchpad.net

Commit message

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

To post a comment you must log in.
Steve Langasek (vorlon) :
review: Approve
Scott Moser (smoser) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index 07eb0d0..39788c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
1open-iscsi (2.0.874-5ubuntu14) disco; urgency=medium
2
3 [Steve Langasek]
4 * d/iscsi-disk.rules: Append to SYSTEMD_WANTS variable to avoid clobbering
5 other values that may be present. LP: #1807978
6
7 -- Ryan Harper <ryan.harper@canonical.com> Tue, 11 Dec 2018 17:07:07 -0600
8
1open-iscsi (2.0.874-5ubuntu13) disco; urgency=medium9open-iscsi (2.0.874-5ubuntu13) disco; urgency=medium
210
3 [ Robert C Jennings & Dimitri John Ledkov ]11 [ 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 @@
1# When iscsi disks are present, iscsid.service should be running. LP: #18023541# When iscsi disks are present, iscsid.service should be running. LP: #1802354
2# ID_PATH looks like ip-<ipv4-dotted-quad>:<port>-iscsi-<target>-lun-<lun>2# ID_PATH looks like ip-<ipv4-dotted-quad>:<port>-iscsi-<target>-lun-<lun>
3SUBSYSTEM=="block", ACTION=="add", ENV{ID_PATH}=="*-iscsi-*", ENV{SYSTEMD_WANTS}="iscsid.service"3SUBSYSTEM=="block", ACTION=="add", ENV{ID_PATH}=="*-iscsi-*", ENV{SYSTEMD_WANTS}+="iscsid.service"

Subscribers

People subscribed via source and target branches