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

[Utkarsh Gupta]

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.

[Christian Ehrhardt  (paelzer)]

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

[Christian Ehrhardt  (paelzer)]

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.

[Christian Ehrhardt  (paelzer)]

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.

[Christian Ehrhardt  (paelzer)]

review: Approve

[Christian Ehrhardt  (paelzer)]

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.

[Christian Ehrhardt  (paelzer)]

This is in -proposed and imported, closing the MP

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

diff --git a/debian/changelog b/debian/changelog
index 4b3a37f..d8fa612 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+python-rtslib-fb (2.1.73-1ubuntu4.1) groovy; urgency=medium
+
+  * Fix service fail on install due to name mismatch and lost mkdir (LP: #1916715)
+    - d/python3-rtslib-fb.rtslib-fb-targetctl.service: add back debianized
+      systemd service file.
+    - d/python3-rtslib-fb.rtslib-fb-targetctl.service: Add check to skip
+      starting this service when running in a container (LP: #1865037).
+    - d/rules: install rtslib-fb-targetctl.service as it was in Focal.
+
+ -- Utkarsh Gupta <[e-mail]>  Fri, 12 Mar 2021 15:52:34 +0530
+
 python-rtslib-fb (2.1.73-1ubuntu4) groovy; urgency=medium
 
   * Disable xen-pvscsi due to unsup xen_scsiback module (LP: #1891214)
diff --git a/debian/python3-rtslib-fb.rtslib-fb-targetctl.service b/debian/python3-rtslib-fb.rtslib-fb-targetctl.service
 new file mode 100644
index 0000000..7ef578e
--- /dev/null
+++ b/debian/python3-rtslib-fb.rtslib-fb-targetctl.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Restore LIO kernel target configuration
+Requires=sys-kernel-config.mount
+After=sys-kernel-config.mount network.target local-fs.target
+ConditionVirtualization=!container
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/bin/mkdir -p /etc/rtslib-fb-target
+ExecStart=/usr/bin/targetctl restore
+ExecStop=/usr/bin/targetctl clear
+SyslogIdentifier=target
+
+[Install]
+WantedBy=multi-user.target
diff --git a/debian/rules b/debian/rules
index 4204dfc..8b2dc97 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,4 @@ override_dh_installinit:
 	dh_installinit --name rtslib-fb-targetctl
 
 override_dh_installsystemd:
-	dh_installsystemd \
-		--no-stop-on-upgrade --no-enable --no-start \
-		target.service
-
+	dh_installsystemd -p python3-rtslib-fb --no-stop-on-upgrade --name rtslib-fb-targetctl