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

Proposed by Scott Moser on 2018-12-12
Status: Merged
Merge reported by: Scott Moser
Merged at revision: e2f2894ce98178ffa43eac1a003a6091e74cd310
Proposed branch: ~smoser/ubuntu/+source/open-iscsi:bug/1807978-iscsi-lvm-cosmic
Merge into: ubuntu/+source/open-iscsi:ubuntu/cosmic-devel
Diff against target: 24 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/iscsi-disk.rules (+1/-1)
Reviewer Review Type Date Requested Status
Steve Langasek (community) Approve on 2018-12-12
Ubuntu Server Dev import team 2018-12-12 Pending
Review via email: mp+360764@code.launchpad.net

Commit message

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)

Description of the change

see commit message

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

I've just uploaded to cosmic.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 139c134..26bbd61 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+open-iscsi (2.0.874-5ubuntu9.3) cosmic; urgency=medium
7+
8+ * debian/iscsi-disk.rules: Fix bug with LVM on top of iscsi devices.
9+ (LP: #1807978)
10+
11+ -- Scott Moser <smoser@ubuntu.com> Tue, 11 Dec 2018 19:10:50 -0500
12+
13 open-iscsi (2.0.874-5ubuntu9.2) cosmic; urgency=medium
14
15 [Scott Moser]
16diff --git a/debian/iscsi-disk.rules b/debian/iscsi-disk.rules
17index e0ef836..784072b 100644
18--- a/debian/iscsi-disk.rules
19+++ b/debian/iscsi-disk.rules
20@@ -1,3 +1,3 @@
21 # When iscsi disks are present, iscsid.service should be running. LP: #1802354
22 # ID_PATH looks like ip-<ipv4-dotted-quad>:<port>-iscsi-<target>-lun-<lun>
23-SUBSYSTEM=="block", ACTION=="add", ENV{ID_PATH}=="*-iscsi-*", ENV{SYSTEMD_WANTS}="iscsid.service"
24+SUBSYSTEM=="block", ACTION=="add", ENV{ID_PATH}=="*-iscsi-*", ENV{SYSTEMD_WANTS}+="iscsid.service"

Subscribers

People subscribed via source and target branches