Commented out the checks on the sanity of lvm.conf since they were not quite working...

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

diff --git a/ChangeLog b/ChangeLog
index 1cb590e85d6117cda0a4ba4246c3c76b8bfcb090..18dbb181cf557967a74a08e29d7e02ff52ee8626 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org> gen_initramfs.sh,
+  gen_initrd.sh:
+  Commented out the checks on the sanity of lvm.conf since they were not quite
+  working right. This should fix bug #173622.
+
   09 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org> +x86/nb-busybox.cf:
   Added nb-busybox.cf to x86 on the request of Andrew Gaffney
   <agaffney@gentoo.org>.

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index ab9e560ea8a50da426588eab2b3cd279e82682f4..dcd1ad24ce3331f42fbf7bfae9a726db964b04d8 100644 (file)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -208,7 +208,7 @@ append_lvm2(){
        cd ${TEMP}
        mkdir -p "${TEMP}/initramfs-lvm2-temp/bin/"
        mkdir -p "${TEMP}/initramfs-lvm2-temp/etc/lvm/"
-       if [ -e '/sbin/lvm' ] && ldd /sbin/lvm|grep -q 'not a dynamic executable'
+       if [ -e '/sbin/lvm' ] && LC_ALL="C" ldd /sbin/lvm|grep -q 'not a dynamic executable'
        then
                print_info 1 '          LVM2: Adding support (using local static binaries)...'
                cp /sbin/lvm "${TEMP}/initramfs-lvm2-temp/bin/lvm" ||
@@ -223,15 +223,15 @@ append_lvm2(){
        fi
        if [ -x /sbin/lvm ]
        then
-               lvm dumpconfig 2>&1 > /dev/null || gen_die 'Could not copy over lvm.conf!'
-               ret=$?
-               if [ ${ret} != 0 ]
-               then
+#              lvm dumpconfig 2>&1 > /dev/null || gen_die 'Could not copy over lvm.conf!'
+#              ret=$?
+#              if [ ${ret} != 0 ]
+#              then
                        cp /etc/lvm/lvm.conf "${TEMP}/initramfs-lvm2-temp/etc/lvm/" ||
                                gen_die 'Could not copy over lvm.conf!'
-               else
-                       gen_die 'Could not copy over lvm.conf!'
-               fi
+#              else
+#                      gen_die 'Could not copy over lvm.conf!'
+#              fi
        fi
        cd "${TEMP}/initramfs-lvm2-temp/"
        find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"

diff --git a/gen_initrd.sh b/gen_initrd.sh
index 1a8b3eea5a00dc2c2df2a7e18b71f1b99851fa79..11954e4342af5e74164a2a7d00bfbf4431c31f09 100644 (file)
--- a/gen_initrd.sh
+++ b/gen_initrd.sh
@@ -168,7 +168,7 @@ create_base_initrd_sys() {
        # LVM2
        if [ "${LVM2}" = '1' ]
        then
-               if [ -e '/sbin/lvm' ] && ldd /sbin/lvm|grep -q 'not a dynamic executable';
+               if [ -e '/sbin/lvm' ] && LC_ALL="C" ldd /sbin/lvm|grep -q 'not a dynamic executable';
                then
                        print_info 1 'LVM2: Adding support (using local static binaries)...'
                        cp /sbin/lvm "${TEMP}/initrd-temp/bin/lvm" ||
@@ -189,15 +189,15 @@ create_base_initrd_sys() {
                mkdir -p ${TEMP}/initrd-temp/etc/lvm
                if [ -x /sbin/lvm ]
                then
-                       lvm dumpconfig 2>&1 > /dev/null || gen_die 'Could not copy over lvm.conf!'
-                       ret=$?
-                       if [ ${ret} != 0 ]
-                       then
+#                      lvm dumpconfig 2>&1 > /dev/null || gen_die 'Could not copy over lvm.conf!'
+#                      ret=$?
+#                      if [ ${ret} != 0 ]
+#                      then
                                cp /etc/lvm/lvm.conf "${TEMP}/initramfs-lvm2-temp/etc/lvm/" ||
                                        gen_die 'Could not copy over lvm.conf!'
-                       else
-                               gen_die 'Could not copy over lvm.conf!'
-                       fi
+#                      else
+#                              gen_die 'Could not copy over lvm.conf!'
+#                      fi
                fi
        fi