s/aux/luks/ for gentoo bug #250330

diff --git a/ChangeLog b/ChangeLog
index 9255d41f0c4934a6df6d53c601753eaf7b5520b4..e1ab59e72c42850536fefdcd99b432ff1398d807 100644 (file)
--- 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 <agaffney@gentoo.org> gen_initramfs.sh:
+  s/aux/luks/ for gentoo bug #250330
+
   07 Dec 2008; Andrew Gaffney <agaffney@gentoo.org> 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 10dc2cd0bed9add520e0bff230e4195b588717e8..045574a3206577f08dbec4d3a8e5c8994f4721fe 100644 (file)
--- 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"