From 23ef50635129dceb4df353b2d03770c287da5864 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Mon, 16 Apr 2012 03:55:46 +0200 Subject: [PATCH] Support a non-static cryptsetup binary (bug #409277) .. by making use of copy_binaries --- ChangeLog | 3 +++ gen_initramfs.sh | 6 +----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5de0eff..8eebbaf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ # Distributed under the GPL v2 # $Id$ + 16 Apr 2012; Sebastian Pipping gen_initramfs.sh: + Support a non-static cryptsetup binary (bug #409277) + 09 Apr 2012; Sebastian Pipping defaults/initrd.scripts, defaults/keymaps/keymapList, defaults/keymaps/sf.map: Add keymap "sf" from Pentoo diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 61ebce1..720a25e 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -419,12 +419,8 @@ append_luks() { [ -x "${_luks_source}" ] \ || gen_die "$(printf "${_luks_error_format}" "no file ${_luks_source}")" - is_static "${_luks_source}" \ - || gen_die "$(printf "${_luks_error_format}" "${_luks_source} not a static binary")" - print_info 1 "Including LUKS support" - cp "${_luks_source}" ${TEMP}/initramfs-luks-temp${_luks_dest} - chmod +x "${TEMP}/initramfs-luks-temp${_luks_dest}" + copy_binaries "${TEMP}/initramfs-luks-temp/" /sbin/cryptsetup fi find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ -- 2.26.2