From: Andrew Gaffney Date: Tue, 9 Dec 2008 04:44:11 +0000 (-0600) Subject: s/aux/luks/ for gentoo bug #250330 X-Git-Tag: v3.4.10.903~40 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=899fe9895c5537ea7e0da9c9c47e0daf0ec79375;p=genkernel.git s/aux/luks/ for gentoo bug #250330 --- diff --git a/ChangeLog b/ChangeLog index 9255d41..e1ab59e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2008 Gentoo Foundation; 2008 Chris Gianelloni, Andrew Gaffney # Distributed under the GPL v2 + 09 Dec 2008; Andrew Gaffney gen_initramfs.sh: + s/aux/luks/ for gentoo bug #250330 + 07 Dec 2008; Andrew Gaffney arch/alpha/busy-config, arch/ia64/busy-config, arch/mips/busy-config, arch/parisc/busy-config, arch/parisc64/busy-config, arch/ppc/busy-config, arch/ppc64/busy-config, diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 10dc2cd..045574a 100644 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -296,15 +296,15 @@ append_luks() { if is_static /bin/cryptsetup then print_info 1 "Including LUKS support" - rm -f ${TEMP}/initramfs-aux-temp/sbin/cryptsetup - cp /bin/cryptsetup ${TEMP}/initramfs-aux-temp/sbin/cryptsetup - chmod +x "${TEMP}/initramfs-aux-temp/sbin/cryptsetup" + rm -f ${TEMP}/initramfs-luks-temp/sbin/cryptsetup + cp /bin/cryptsetup ${TEMP}/initramfs-luks-temp/sbin/cryptsetup + chmod +x "${TEMP}/initramfs-luks-temp/sbin/cryptsetup" elif is_static /sbin/cryptsetup then print_info 1 "Including LUKS support" - rm -f ${TEMP}/initramfs-aux-temp/sbin/cryptsetup - cp /sbin/cryptsetup ${TEMP}/initramfs-aux-temp/sbin/cryptsetup - chmod +x "${TEMP}/initramfs-aux-temp/sbin/cryptsetup" + rm -f ${TEMP}/initramfs-luks-temp/sbin/cryptsetup + cp /sbin/cryptsetup ${TEMP}/initramfs-luks-temp/sbin/cryptsetup + chmod +x "${TEMP}/initramfs-luks-temp/sbin/cryptsetup" else print_info 1 "LUKS support requires static cryptsetup at /bin/cryptsetup or /sbin/cryptsetup"