Support a non-static cryptsetup binary (bug #409277)

.. by making use of copy_binaries

diff --git a/ChangeLog b/ChangeLog
index 5de0effc8d5813205d040445333e50f76a1626ba..8eebbaf0055fdfad1772b97b6f8c85be88b2aed4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  16 Apr 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
+  Support a non-static cryptsetup binary (bug #409277)
+
   09 Apr 2012; Sebastian Pipping <sping@gentoo.org> 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 61ebce14bb496717852d319187211e2a2dd2c572..720a25e89073b1dd20c5c18ca6f5cf1029c51f0e 100755 (executable)
--- 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}" \