>> 3.0.2c. Adding LVM2 args code to gen_determineargs.sh.

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

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index b407cf730659d2b853e73e1dd704928ca87b10e2..0d0463e3a52042269424f6515118df4eb20ea0ca 100644 (file)
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -215,4 +215,11 @@ determine_real_args() {
                UDEV=0
                DEVFS=1
        fi
+
+       if isTrue "${CMD_LVM2}"
+       then
+               LVM2=1
+       else
+               LVM2=0
+       fi
 }

diff --git a/gen_initrd.sh b/gen_initrd.sh
index 7a44702bb526048fa86ef87f96875148c4cc5353..5f1b824e4ad16297f78a75ce2ba2d7d5075c6752 100644 (file)
--- a/gen_initrd.sh
+++ b/gen_initrd.sh
@@ -93,7 +93,7 @@ create_base_initrd_sys() {
 #              gen_die "could not uncompress devfsd.conf"
 
        # LVM2
-       if [ "${CMD_LVM2}" -eq '1' ]
+       if [ "${LVM2}" -eq '1' ]
        then
                if [ -e '/sbin/lvm' ] && ldd /sbin/lvm|grep -q 'not a dynamic executable';
                then
@@ -130,7 +130,7 @@ create_base_initrd_sys() {
        # EVMS2
        if [ -e '/sbin/evms_activate' ]
        then
-               if [ "${CMD_NOEVMS2}" -ne '1' ]
+               if [ "${CMD_NOEVMS2}" != '1' ]
                then
                        print_info 1 'EVMS2: Adding support...' 
                        mkdir -p ${TEMP}/initrd-temp/lib