Merge ~grozzly/ubuntu/+source/cryptsetup:ubuntu/devel into ubuntu/+source/cryptsetup:ubuntu/devel

[Adam Vodopjan]

[Dan Bungert (dbungert)]

LGTM, uploading.

Unmerged commits

0c79a7a... by Adam Vodopjan <email address hidden> on 2024-05-20

Clean up and fix pgrep_exe() in cryptroot-unlock

- minimize Debian vs Ubuntu differences in the code
- skip the header in "ps" output

This commit makes pgrep_exe() only look into the "pid" column of "ps" output.
As a side effect, the behaviour described in #1968636 no longer happens.

LP: #1968636

ea7fa22... by Julian Andres Klode on 2024-04-08

2:2.7.0-1ubuntu4 (patches unapplied)

Imported using git-ubuntu import.

4500c1e... by Steve Langasek on 2024-03-31

2:2.7.0-1ubuntu3 (patches unapplied)

Imported using git-ubuntu import.

ebbedbb... by Steve Langasek on 2024-03-04

2:2.7.0-1ubuntu2 (patches unapplied)

Imported using git-ubuntu import.

8fafc28... by Matthias Klose on 2024-02-29

2:2.7.0-1ubuntu1 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/debian/initramfs/cryptroot-unlock b/debian/initramfs/cryptroot-unlock
index 0e91701..f904acc 100644
--- a/debian/initramfs/cryptroot-unlock
+++ b/debian/initramfs/cryptroot-unlock
@@ -40,14 +40,8 @@ fi
 pgrep_exe() {
 	local exe pid
 	exe="$(readlink -f -- "$1" 2>/dev/null)" && [ -f "$exe" ] || return 0
-	ps | awk '{print $1, $5}' | while read LINE; do
-		set $LINE
-		local pid=$1
-		local cmd=$(readlink -f -- "$2")
-		if [ "$cmd" == "$exe" ]; then
-			echo $pid
-			break
-		fi
+	ps | sed 1d | while read pid _; do
+		[ "$(readlink -f "/proc/$pid/exe")" != "$exe" ] || printf '%d\n' "$pid"
 	done
 }