Merge ~wilkmarcin/ubuntu/+source/clevis:lp2065149-noble-ps-invalid-option--o into ubuntu/+source/clevis:ubuntu/noble-devel

[Marcin Wilk]

Backported existing upstream fix https://github.com/latchset/clevis/commit/55eb002f7955279aebe4ca720c51ebd5f4d893f5

    * debian/patches/lp2065149-ps-invalid-option--o.patch: initramfs:
      fix killing child PIDs. Thanks to Oldřich Jedlička
      <email address hidden>. (LP: #2065149)

Please tag & sponsor.

PPA: ppa:wilkmarcin/wilkmarcin-srus

Steps to test:
Install clevis and clevis-initramfs packages version 20-1 on Ubuntu Noble.
Reboot the system. The following error will appear in the boot messages:
```
Begin: Running /scripts/local-bottom ... ps: invalid option -- 'o'
BusyBox v1.36.1 (Ubuntu 1:1.36.1-6ubuntu3.1) multi-call binary.

Usage: ps

Show list of processes

 w Wide output
 l Long output
done.
Begin: Running /scripts/init-bottom ... done.
```
Next, install the patched version:
# sudo add-apt-repository ppa:wilkmarcin/wilkmarcin-srus
# sudo apt update
# sudo apt install clevis-initramfs -y

Reboot the system. The aforementioned error will no longer appear.

Package Test Results:

autopkgtest [17:15:08]: test run-testsuite: -----------------------]
autopkgtest [17:15:08]: test run-testsuite: - - - - - - - - - - results - - - - - - - - - -
run-testsuite PASS
autopkgtest [17:15:08]: @@@@@@@@@@@@@@@@@@@@ summary
run-testsuite PASS

[Dariusz Gadomski (dgadomski)]

lgtm

review: Approve

Unmerged commits

363234f... by Marcin Wilk on 2026-02-02

Update maintainer

8d8b61f... by Marcin Wilk on 2026-02-02

Update changelog

39db123... by Marcin Wilk on 2026-02-02

[PATCH] initramfs: fix killing child PIDs

Signed-off-by: Marcin Wilk <email address hidden>

diff --git a/debian/changelog b/debian/changelog
index f587c29..977f737 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+clevis (20-1ubuntu0.24.04.1) noble; urgency=medium
+
+  * debian/patches/lp2065149-ps-invalid-option--o.patch: initramfs:
+    fix killing child PIDs. Thanks to Oldřich Jedlička
+    <[e-mail]>. (LP: #2065149)
+
+ -- Marcin Wilk <[e-mail]>  Tue, 20 Jan 2026 14:26:53 +0100
+
 clevis (20-1) unstable; urgency=medium
 
   * New upstream version 20. Closes: #1068640
diff --git a/debian/control b/debian/control
index 4334c23..96aab76 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: clevis
-Maintainer: Christoph Biedl <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Christoph Biedl <[e-mail]>
 Homepage: https://github.com/latchset/clevis
 Standards-Version: 4.6.2
 Vcs-Browser: https://git.in-ulm.de/cbiedl/clevis
diff --git a/debian/patches/lp2065149-ps-invalid-option--o.patch b/debian/patches/lp2065149-ps-invalid-option--o.patch
new file mode 100644
index 0000000..57026a5
--- /dev/null
+++ b/debian/patches/lp2065149-ps-invalid-option--o.patch
@@ -0,0 +1,59 @@
+From 55eb002f7955279aebe4ca720c51ebd5f4d893f5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Old=C5=99ich=20Jedli=C4=8Dka?= <[e-mail]>
+Date: Tue, 29 Oct 2024 20:32:21 +0100
+Subject: [PATCH] initramfs: fix killing child PIDs
+Origin: upstream, https://github.com/latchset/clevis/commit/55eb002f7955279aebe4ca720c51ebd5f4d893f5
+Bug: https://github.com/latchset/clevis/pull/496
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/clevis/+bug/2065149
+Applied-Upstream: commit: 55eb002f7955279aebe4ca720c51ebd5f4d893f5
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Ubuntu's initramfs Busybox does not support `ps -o pid,ppid`, so fallback
+to unpredictable `ps -l`. In any case use `awk` to find the position of PID
+and PPID columns and dump appropriate child PIDs. This should be hopefully
+bullet-proof.
+
+Also clean-up leftover PID file.
+
+Signed-off-by: Oldřich Jedlička <[e-mail]>
+---
+ .../scripts/local-bottom/clevis.in                | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/src/initramfs-tools/scripts/local-bottom/clevis.in b/src/initramfs-tools/scripts/local-bottom/clevis.in
+index fff3d75..4798f20 100755
+--- a/src/initramfs-tools/scripts/local-bottom/clevis.in
++++ b/src/initramfs-tools/scripts/local-bottom/clevis.in
+@@ -34,11 +34,22 @@ esac
+ [ -s /run/clevis.pid ] || exit 0
+ 
+ pid=$(cat /run/clevis.pid)
+-child_pids=$(ps -o pid,ppid | awk -v pid="$pid" '$2==pid { print $1 }')
++child_pids="$({ ps -o pid,ppid 2>/dev/null || ps -l ||
++    { echo 'clevis: unable to get list of processes' >&2; exit 1; }; } |
++    awk -v pid="$pid" '
++        NR==1 {
++            for (i=1; i<=NF; i++) if ($i == "PID") pid_col = i; else if ($i == "PPID") ppid_col = i
++            if (!pid_col || !ppid_col) { print "clevis: unable to find PID and/or PPID columns in ps output" | "cat >&2"; exit 1 }
++            next
++        }
++        { if ($ppid_col == pid) print $pid_col }')"
++
+ for kill_pid in $pid $child_pids; do
+-	kill "$kill_pid"
++    kill "$kill_pid" 2>/dev/null
+ done
+ 
++rm -f /run/clevis.pid
++
+ # Not really worried about downing extra interfaces: they will come up
+ # during the actual boot. Might make this configurable later if needed.
+ 
+-- 
+2.43.0
+
diff --git a/debian/patches/series b/debian/patches/series
index f34cc3d..ecbbe16 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ for-upstream/2020-05-21.embed-more-programs-in-initram.patch
 
 # patches for Debian
 debian/2020-05-21.set-unprivileged-user.patch
+lp2065149-ps-invalid-option--o.patch