Fixed lvm/evms code for initrd generation. Thanks to Vinny <vfuria@gmail.com> on...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@518 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/ChangeLog b/ChangeLog
index 19ceedc116ee72e2ba8de3c7b230541c80a3edd9..b0f6c4523696761a62cd9a199d62729bf70dc7b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Jun 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_initrd.sh:
+  Fixed lvm/evms code for initrd generation. Thanks to Vinny
+  <vfuria@gmail.com> on bug #179480 for pointing it out.
+
   21 Jun 2007; Chris Gianelloni <wolf31o2@gentoo.org> alpha/modules_load,
   generic/initrd.defaults, ia64/modules_load, ppc/modules_load,
   ppc64/modules_load, um/modules_load, x86/modules_load,

diff --git a/gen_initrd.sh b/gen_initrd.sh
index 11954e4342af5e74164a2a7d00bfbf4431c31f09..4cef7044458e497128067f057950b743a5bf879f 100644 (file)
--- a/gen_initrd.sh
+++ b/gen_initrd.sh
@@ -193,7 +193,7 @@ create_base_initrd_sys() {
 #                      ret=$?
 #                      if [ ${ret} != 0 ]
 #                      then
-                               cp /etc/lvm/lvm.conf "${TEMP}/initramfs-lvm2-temp/etc/lvm/" ||
+                               cp /etc/lvm/lvm.conf "${TEMP}/initrd-temp/etc/lvm/" ||
                                        gen_die 'Could not copy over lvm.conf!'
 #                      else
 #                              gen_die 'Could not copy over lvm.conf!'
@@ -215,7 +215,7 @@ create_base_initrd_sys() {
                                || gen_die 'Could not copy files for EVMS2!'
                        if [ -n "`ls /lib/libgcc_s*`" ]
                        then
-                               cp -a /lib/libgcc_s* "${TEMP}/initramfs-evms2-temp/lib" \
+                               cp -a /lib/libgcc_s* "${TEMP}/initrd-temp/lib" \
                                        || gen_die 'Could not copy files for EVMS2!'
                        fi
                        cp -a /lib/libc-* /lib/libc.* "${TEMP}/initrd-temp/lib" \