From e1e107ad4e588ee2e511a281737e0bc1ba503f25 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 1 Apr 2020 16:44:22 +0200 Subject: [PATCH] GRMLBASE/80-initramfs: no longer set CRYPTSETUP=y MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Quoting from cryptsetup's Debian packaging git: | commit 06f8c00c908ffd1fa95c4afc78e9cac462d01d91 | Author: Guilhem Moulin | Date: Sat Jul 20 19:18:21 2019 -0300 | | initramfs: Remove compatibility warnings regarding CRYPTSETUP=[y|n]. | | The warning was added in 2:2.0.3-1 for the ‘cryptsetup’ package split | into ‘cryptsetup-run’ and ‘cryptsetup-initramfs’. With the recent | Buster release we can now move on: cryptsetup is always copied to the | initramfs when the ‘cryptsetup-initramfs’ package is installed. Given that we have the cryptsetup-initramfs package in GRMLBASE, we no longer need to use this. Closes: https://github.com/grml/grml/issues/82 --- etc/grml/fai/config/scripts/GRMLBASE/80-initramfs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/grml/fai/config/scripts/GRMLBASE/80-initramfs b/etc/grml/fai/config/scripts/GRMLBASE/80-initramfs index a56a579..82cf083 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/80-initramfs +++ b/etc/grml/fai/config/scripts/GRMLBASE/80-initramfs @@ -20,8 +20,8 @@ fi echo "Rebuilding initramfs" for initrd in "$(basename $target/boot/vmlinuz-*)" ; do - if ! CRYPTSETUP=y $ROOTCMD update-initramfs -k "${initrd##vmlinuz-}" -c ; then - echo "Creating fresh initrd did not work, trying update instead:" - CRYPTSETUP=y $ROOTCMD update-initramfs -k "${initrd##vmlinuz-}" -u + if ! $ROOTCMD update-initramfs -k "${initrd##vmlinuz-}" -c ; then + echo "Creating fresh initramfs did not work, trying update instead:" + $ROOTCMD update-initramfs -k "${initrd##vmlinuz-}" -u fi done -- 2.1.4