Merge ~paelzer/ubuntu/+source/open-iscsi:lp-1922976-finalrd-logout-FOCAL into ubuntu/+source/open-iscsi:ubuntu/focal-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4527/+packages

[Utkarsh Gupta (utkarsh)]

Hello,

Whilst the changes look good, I'd like to wait for Michael to confirm back that this fix indeed fixes the issue for them. I hope there's no rush in this MP and can wait until they can confirm the same.

Hence marking "Needs Information" for the time being.

Besides, a trivial question in the diff below:

review: Needs Information

[Christian Ehrhardt  (paelzer)]

Fixed the comment paride made, thanks for the other discussions - but following the outcome no changes due to those.

Yes I'm waiting for Michael to test before upload, but that should (IMHO) not block the review.

If all here looks good, then it should be up to me to wait for everything else to be complete as well :-) That way I can control the potential extra delay instead of waiting for a re-review then.

[Utkarsh Gupta (utkarsh)]

Hi Christian,

> If all here looks good, then it should be up to me to wait for
> everything else to be complete as well :-) That way I can
> control the potential extra delay instead of waiting for a
> re-review then.

Of course. I did mention that the changes look good in the very first sentence of the initial review and wrote about the other concerns/questions/curiosities, heh :)

That said, here's the more official review:

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

* Actual changes:
  - [✔] no upstream changes to consider
  - [✔] no further upstream version to consider
  - [✔] debian changes look safe

* New Delta:
  - [✔] no new patches added

* Build/Test:
  - [✔] build is ok
  - [✔] verified PPA package installs/uninstalls
  - [✔] sanity checks test fine

Thanks to Michael Brown for testing this fix! \o/

review: Approve

[Christian Ehrhardt  (paelzer)]

Hirsute complete - for this SRU Tag pushed and .changes uploaded

diff --git a/debian/changelog b/debian/changelog
index 4dc56b9..779a72d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+open-iscsi (2.0.874-7.1ubuntu6.2) focal; urgency=medium
+
+  * d/open-iscsi.finalrd: fix UID resolution issues in logout (LP: #1922976)
+    Thanks to Michael Brown
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 18 Mar 2021 09:44:07 +0100
+
 open-iscsi (2.0.874-7.1ubuntu6.1) focal; urgency=medium
 
    [ Ben Swartzlander ]
diff --git a/debian/open-iscsi.finalrd b/debian/open-iscsi.finalrd
index d8c8a21..d0f4352 100755
--- a/debian/open-iscsi.finalrd
+++ b/debian/open-iscsi.finalrd
@@ -14,9 +14,16 @@ then
     copy_exec /usr/bin/expr
     copy_file config /etc/iscsi/iscsid.conf
     copy_file config /etc/iscsi/initiatorname.iscsi
+    # needed to resolve UIDs (LP: #1922976)
+    copy_exec /usr/lib/*/libnss_files.so.*
     exit 0
 fi
 
+# if not present in the environment, then fake a trivial passwd file (LP: #1922976)
+if [ ! -e /etc/passwd ] ; then
+    echo "root:x:0:0:root:/:/bin/sh" > /etc/passwd
+fi
+
 # re-establish connection and logout during shutdown
 # if initramfs did bring up open-iscsi on boot
 [ -f /open-iscsi.interface ] || exit 0