From: Nikita Dubrovskii <nikita@linux.ibm.com>
Date: Fri, 27 May 2022 07:13:18 +0000 (+0200)
Subject: s390x: do not unpack existing initrd, just append LUKS keys to its copy
X-Git-Tag: archive/raspbian/2022.4-1+rpi1^2~9^2^2~8^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=972f00e4835053b5c000937be2847da658f005dd;p=ostree.git

s390x: do not unpack existing initrd, just append LUKS keys to its copy

Signed-off-by: Nikita Dubrovskii <nikita@linux.ibm.com>
---

diff --git a/src/libostree/s390x-se-luks-gencpio b/src/libostree/s390x-se-luks-gencpio
index ce401888..e821e2fe 100755
--- a/src/libostree/s390x-se-luks-gencpio
+++ b/src/libostree/s390x-se-luks-gencpio
@@ -4,19 +4,19 @@ set -euo pipefail
 
 old_initrd=$1
 new_initrd=$2
+currdir=$PWD
 
-# Unpacking existing initramdisk
+# Copying existing initramdisk
+cp ${old_initrd} ${new_initrd}
+
+# Appending LUKS root keys and crypttab config to the end of initrd
 workdir=$(mktemp -d -p /tmp se-initramfs-XXXXXX)
 cd ${workdir}
-gzip -cd ${old_initrd} | cpio -imd --quiet
-
-# Adding LUKS root key and crypttab config
 mkdir -p etc/luks
 cp -f /etc/luks/* etc/luks/
 cp -f /etc/crypttab etc/
-
-# Creating new initramdisk image
 find . -mindepth 1 | cpio --quiet -H newc -o | gzip -9 -n >> ${new_initrd}
 
 # Cleanup
+cd ${currdir}
 rm -rf ${workdir}