Merge ~utkarsh/ubuntu/+source/python-rtslib-fb:lp1916715-fix-service-groovy into ubuntu/+source/python-rtslib-fb:ubuntu/groovy-devel

Proposed by Utkarsh Gupta
Status: Merged
Approved by: Christian Ehrhardt 
Approved revision: 691a1a4810bbc9292e093b531019c779009cb90d
Merge reported by: Utkarsh Gupta
Merged at revision: 691a1a4810bbc9292e093b531019c779009cb90d
Proposed branch: ~utkarsh/ubuntu/+source/python-rtslib-fb:lp1916715-fix-service-groovy
Merge into: ubuntu/+source/python-rtslib-fb:ubuntu/groovy-devel
Diff against target: 54 lines (+28/-4)
3 files modified
debian/changelog (+11/-0)
debian/python3-rtslib-fb.rtslib-fb-targetctl.service (+16/-0)
debian/rules (+1/-4)
Reviewer Review Type Date Requested Status
Christian Ehrhardt  (community) Approve
Canonical Server packageset reviewers Pending
Canonical Server Team Pending
Review via email: mp+399576@code.launchpad.net

Description of the change

Hiya,

This MP fixes the installation of python3-rtslib-fb package in Groovy.
PPA at https://launchpad.net/~utkarsh/+archive/ubuntu/experimental-dump.

The (only superficial) autopkgtest is passing. Besides, I've manually confirmed that this issue is indeed fixed when installing the package with this patch on top.

Should you need any more details, let me know. Requesting you to please review and sponsor the upload. TIA.

To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Changelog:
- [✓] changelog entry correct version and targeted codename
- [✓] changelog entries correct
- [✓] update-maintainer has been run

Actual changes:
- [✓] no major upstream changes to consider (no merge)
- [✓] no further upstream version to consider (no merge)
- [✓] debian changes look safe (none)

New Delta
- [✓] new patches are good and match Hirsute

Build/Test:
- [✓] build is ok
- [✓] verified PPA package installs/uninstalls
- [✓] autopkgtest against the PPA package passes
- [✓] sanity checks test fine

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

status in container after install
root@g:~# systemctl status rtslib-fb-targetctl
● rtslib-fb-targetctl.service - Restore LIO kernel target configuration
     Loaded: loaded (/lib/systemd/system/rtslib-fb-targetctl.service; enabled; vendor preset: enabled)
     Active: inactive (dead)

Mar 15 10:32:56 g systemd[1]: Condition check resulted in Restore LIO kernel target configuration being skipped.

status in VM after install
ubuntu@g-tgt:~$ systemctl status rtslib-fb-targetctl
● rtslib-fb-targetctl.service - Restore LIO kernel target configuration
     Loaded: loaded (/lib/systemd/system/rtslib-fb-targetctl.service; enabled; vendor preset: enabled)
     Active: active (exited) since Mon 2021-03-15 10:33:02 UTC; 17s ago
   Main PID: 2004 (code=exited, status=0/SUCCESS)
      Tasks: 0 (limit: 527)
     Memory: 0B
     CGroup: /system.slice/rtslib-fb-targetctl.service

Mar 15 10:33:02 g-tgt systemd[1]: Starting Restore LIO kernel target configuration...
Mar 15 10:33:02 g-tgt target[2004]: No saved config file at /etc/rtslib-fb-target/saveconfig.json, ok, exiting
Mar 15 10:33:02 g-tgt systemd[1]: Finished Restore LIO kernel target configuration.

ok, no config let it start and end, but that is fine.

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

SRU template in 1916715 LGTM
SRU template in 1865037 LGTM as well and I also have no other idea for "problems would occur" than (very very) privileged containers that manually got fixed to work before. But in that case the regression should be small and the fix easy.

Revision history for this message
Christian Ehrhardt  (paelzer) :
review: Approve
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Ha I found one very minor thing
(gladly, I guess I'm supposed to find sometinhg - am I?)
One of the changelog lines is >80 chars

Fixed on upload.

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/python-rtslib-fb
 * [new tag] upload/2.1.73-1ubuntu4.1 -> upload/2.1.73-1ubuntu4.1

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading python-rtslib-fb_2.1.73-1ubuntu4.1.dsc: done.
  Uploading python-rtslib-fb_2.1.73-1ubuntu4.1.debian.tar.xz: done.
  Uploading python-rtslib-fb_2.1.73-1ubuntu4.1_source.buildinfo: done.
  Uploading python-rtslib-fb_2.1.73-1ubuntu4.1_source.changes: done.
Successfully uploaded packages.

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

This is in -proposed and imported, closing the MP

P.S. it is in -proposed for a suspiciously long time ...

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 4b3a37f..d8fa612 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,14 @@
6+python-rtslib-fb (2.1.73-1ubuntu4.1) groovy; urgency=medium
7+
8+ * Fix service fail on install due to name mismatch and lost mkdir (LP: #1916715)
9+ - d/python3-rtslib-fb.rtslib-fb-targetctl.service: add back debianized
10+ systemd service file.
11+ - d/python3-rtslib-fb.rtslib-fb-targetctl.service: Add check to skip
12+ starting this service when running in a container (LP: #1865037).
13+ - d/rules: install rtslib-fb-targetctl.service as it was in Focal.
14+
15+ -- Utkarsh Gupta <utkarsh.gupta@canonical.com> Fri, 12 Mar 2021 15:52:34 +0530
16+
17 python-rtslib-fb (2.1.73-1ubuntu4) groovy; urgency=medium
18
19 * Disable xen-pvscsi due to unsup xen_scsiback module (LP: #1891214)
20diff --git a/debian/python3-rtslib-fb.rtslib-fb-targetctl.service b/debian/python3-rtslib-fb.rtslib-fb-targetctl.service
21new file mode 100644
22index 0000000..7ef578e
23--- /dev/null
24+++ b/debian/python3-rtslib-fb.rtslib-fb-targetctl.service
25@@ -0,0 +1,16 @@
26+[Unit]
27+Description=Restore LIO kernel target configuration
28+Requires=sys-kernel-config.mount
29+After=sys-kernel-config.mount network.target local-fs.target
30+ConditionVirtualization=!container
31+
32+[Service]
33+Type=oneshot
34+RemainAfterExit=yes
35+ExecStart=/bin/mkdir -p /etc/rtslib-fb-target
36+ExecStart=/usr/bin/targetctl restore
37+ExecStop=/usr/bin/targetctl clear
38+SyslogIdentifier=target
39+
40+[Install]
41+WantedBy=multi-user.target
42diff --git a/debian/rules b/debian/rules
43index 4204dfc..8b2dc97 100755
44--- a/debian/rules
45+++ b/debian/rules
46@@ -36,7 +36,4 @@ override_dh_installinit:
47 dh_installinit --name rtslib-fb-targetctl
48
49 override_dh_installsystemd:
50- dh_installsystemd \
51- --no-stop-on-upgrade --no-enable --no-start \
52- target.service
53-
54+ dh_installsystemd -p python3-rtslib-fb --no-stop-on-upgrade --name rtslib-fb-targetctl

Subscribers

People subscribed via source and target branches