Fix evms bugs with missing sbin. Remove prepare line as it probably isnt necessary

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

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index f6015d082899424179fea191155201c865871b45..550955bbd01c5c75f628ff31215815139e771417 100644 (file)
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -42,7 +42,7 @@ get_KV() {
                then
                        KERN_24=0
                        cd ${KERNEL_DIR}
-                       compile_generic prepare kernel > /dev/null 2>&1
+                       #compile_generic prepare kernel > /dev/null 2>&1
                        cd - > /dev/null 2>&1
                        if [ -f ${KERNEL_DIR}/include/linux/version.h ]
                        then

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index a664e603e081d34fa9dcbe7432aab8ba68fb42d8..a122864c99979f150feadc5391bc0d50c0f25aee 100644 (file)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -236,6 +236,7 @@ create_evms2_cpio(){
                mkdir -p "${TEMP}/initramfs-evms2-temp/lib/evms"
                mkdir -p "${TEMP}/initramfs-evms2-temp/etc/"
                mkdir -p "${TEMP}/initramfs-evms2-temp/bin/"
+               mkdir -p "${TEMP}/initramfs-evms2-temp/sbin/"
                if [ "${EVMS2}" -eq '1' ]
                then
                        print_info 1 '          EVMS2: Adding support...'       
@@ -249,7 +250,7 @@ create_evms2_cpio(){
                        cp -a /lib/evms "${TEMP}/initramfs-evms2-temp/lib" || gen_die 'Could not copy files for EVMS2!'
                        cp -a /lib/evms/* "${TEMP}/initramfs-evms2-temp/lib/evms" || gen_die 'Could not copy files for EVMS2!'
                        cp -a /etc/evms.conf "${TEMP}/initramfs-evms2-temp/etc" || gen_die 'Could not copy files for EVMS2!'
-                       cp /sbin/evms_activate "${TEMP}/initramfs-evms2-temp/sbin/evms_activate" || gen_die 'Could not copy over vgscan!'
+                       cp /sbin/evms_activate "${TEMP}/initramfs-evms2-temp/sbin/evms_activate" || gen_die 'Could not copy over evms_activate!'
 
                        # Fix EVMS2 complaining that it can't find the swap utilities.
                        # These are not required in the initramfs