From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SJbpx-00069R-6U for garchives@archives.gentoo.org; Mon, 16 Apr 2012 02:38:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53610E0E7B; Mon, 16 Apr 2012 02:38:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 28F67E0E7B for ; Mon, 16 Apr 2012 02:38:29 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8E3E91B4064 for ; Mon, 16 Apr 2012 02:38:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 71DCCE542C for ; Mon, 16 Apr 2012 02:38:26 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1334541481.23ef50635129dceb4df353b2d03770c287da5864.sping@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: ChangeLog gen_initramfs.sh X-VCS-Directories: / X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 23ef50635129dceb4df353b2d03770c287da5864 X-VCS-Branch: master Date: Mon, 16 Apr 2012 02:38:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: a4ee3c86-a108-4a41-acf9-9aa8bdc5d15f X-Archives-Hash: 01d7cea5276b533a2f0710c5fb95973d commit: 23ef50635129dceb4df353b2d03770c287da5864 Author: Sebastian Pipping pipping org> AuthorDate: Mon Apr 16 01:55:46 2012 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Mon Apr 16 01:58:01 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3D23ef5063 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$ =20 + 16 Apr 2012; Sebastian Pipping gen_initramfs.sh: + Support a non-static cryptsetup binary (bug #409277) + 09 Apr 2012; Sebastian Pipping defaults/initrd.scri= pts, 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= }")" =20 - 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 =20 find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \