Browse Source

Enhance "Work around /dev/fd/<num> no longer being created by systemd". Closes: #979089

Christoph Biedl 1 year ago
parent
commit
4dd26748db
1 changed files with 19 additions and 4 deletions
  1. 19 4
      debian/patches/upstream.work-around-missing-dev-fd-links.patch

+ 19 - 4
debian/patches/upstream.work-around-missing-dev-fd-links.patch

@@ -2,7 +2,10 @@ Subject: Work around /dev/fd/<num> no longer being created by systemd
 Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 Date: 2020-05-21
 Bug: https://github.com/latchset/clevis/issues/262
-Bug-Debian: https://bugs.debian.org/968518
+Bug-Debian: 
+    https://bugs.debian.org/968518
+    https://bugs.debian.org/979089
+Last-Update: 2020-01-03
 
 --- a/src/clevis-decrypt
 +++ b/src/clevis-decrypt
@@ -16,6 +19,14 @@ Bug-Debian: https://bugs.debian.org/968518
  fi
  
  exec >&2
+--- a/src/luks/clevis-luks-unlock
++++ b/src/luks/clevis-luks-unlock
+@@ -65,4 +65,4 @@
+     exit 1
+ fi
+ 
+-cryptsetup open -d- "${DEV}" "${NAME}" < <(echo -n "${pt}")
++echo -n "${pt}" | cryptsetup open -d- "${DEV}" "${NAME}"
 --- a/src/pins/tang/clevis-decrypt-tang
 +++ b/src/pins/tang/clevis-decrypt-tang
 @@ -88,4 +88,5 @@
@@ -27,10 +38,14 @@ Bug-Debian: https://bugs.debian.org/968518
 +exit $?
 --- a/src/pins/tpm2/clevis-decrypt-tpm2
 +++ b/src/pins/tpm2/clevis-decrypt-tpm2
-@@ -169,4 +169,5 @@
- # directory at this point.
- [ -d "${TMP}" ] && rm -rf "${TMP}"
+@@ -165,8 +165,5 @@
+     exit 1
+ fi
  
+-# The on_exit() trap will not be fired after exec, so let's clean up the temp
+-# directory at this point.
+-[ -d "${TMP}" ] && rm -rf "${TMP}"
+-
 -exec jose jwe dec -k- -i- < <(echo -n "$jwk$hdr."; /bin/cat)
 +(echo -n "$jwk$hdr."; /bin/cat) | jose jwe dec -k- -i-
 +exit $?