From a8c50c16eab0a49c605121339e6efd872aa1a8ea Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 21 Jul 2016 19:29:26 +0200 Subject: [PATCH] trustfence-initramfs-init: remove cryptsetup from init script New functionality has been implemented in trustfence-tool application, so there is no need to call cryptsetup command. Signed-off-by: Javier Viguera --- .../trustfence-initramfs/trustfence-initramfs-init | 5 +---- meta-digi-dey/recipes-core/trustfence/trustfence-tool_1.0.bb | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs/trustfence-initramfs-init b/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs/trustfence-initramfs-init index a6c6f2f6e..441635f73 100644 --- a/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs/trustfence-initramfs-init +++ b/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs/trustfence-initramfs-init @@ -48,13 +48,10 @@ fi root="$(findfs ${root})" # Open LUKS encrypted device -TMP_KEYFILE="$(mktemp keyfile.XXXXXX)" -trustfence-tool -f ${TMP_KEYFILE} -if cryptsetup --key-file ${TMP_KEYFILE} open --type luks ${root} cryptroot; then +if trustfence-tool ${root} cryptroot; then # Reset root variable to the decrypted mapped device root="/dev/mapper/cryptroot" fi -wipe -cfs ${TMP_KEYFILE} # Mount mapped device mkdir -p /newroot diff --git a/meta-digi-dey/recipes-core/trustfence/trustfence-tool_1.0.bb b/meta-digi-dey/recipes-core/trustfence/trustfence-tool_1.0.bb index 468bb3ca6..88eb069b9 100644 --- a/meta-digi-dey/recipes-core/trustfence/trustfence-tool_1.0.bb +++ b/meta-digi-dey/recipes-core/trustfence/trustfence-tool_1.0.bb @@ -6,7 +6,7 @@ LICENSE = "CLOSED" SRC_URI = "${DIGI_PKG_SRC}/${BP}.tar.gz" -SRC_URI[md5sum] = "aa9b8b530402f412886e1f8f1da466e6" -SRC_URI[sha256sum] = "dbeb718158a4a55552bb3a2c03990df3167331bb772925f824ebc02348e29089" +SRC_URI[md5sum] = "1140b71d0e619001b677117e8938be48" +SRC_URI[sha256sum] = "13eecca139dfb6470204c75291c5791144dea098653f52d39d847b2aee3fe19b" inherit bin_package