Add --evms2 patch by Eric Edgar; bug #77385.

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

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index b02e105a07d90b8428ceb53b4bf4a258bf9e28f2..7f7fa96c5261a7101e1920274c5af0508337f02d 100755 (executable)
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -63,6 +63,8 @@ longusage() {
   echo "       --bootsplash=<theme>    Force bootsplash using <theme>"
   echo "       --gensplash=<theme>     Force gensplash using <theme>"
   echo "       --do-keymap-auto        Forces keymap selection at boot"
+  echo "       --evms2                 Include EVMS2 support"
+  echo "                                --> 'emerge evms' in the host operating system first"
   echo "       --lvm2                  Include LVM2 support"
   echo "       --bootloader=grub       Add new kernel to GRUB configuration"
   echo "       --linuxrc=<file>        Specifies a user created linuxrc"
@@ -149,9 +151,9 @@ parse_cmdline() {
                      CMD_DOKEYMAPAUTO=1
                      print_info 2 "CMD_DOKEYMAPAUTO: $CMD_DOKEYMAPAUTO"
              ;;
-             --no-evms2)
-                     CMD_NOEVMS2=1
-                     print_info 2 'CMD_NOEVMS2: 1'
+             --evms2)
+                     CMD_EVMS2=1
+                     print_info 2 'CMD_EVMS2: 1'
              ;;
              --lvm2)
                      CMD_LVM2=1

diff --git a/gen_initrd.sh b/gen_initrd.sh
index 409c24b52591fa7e30a43d973f593c96ada037db..2d1b4084b4eaa0b86348cb1fe453f116fc9d3b2b 100644 (file)
--- a/gen_initrd.sh
+++ b/gen_initrd.sh
@@ -128,9 +128,9 @@ create_base_initrd_sys() {
        fi
        
        # EVMS2
-       if [ -e '/sbin/evms_activate' ]
+       if [ "${CMD_EVMS2}" -eq '1' ]
        then
-               if [ "${CMD_NOEVMS2}" != '1' ]
+               if [ -e '/sbin/evms_activate' ]
                then
                        print_info 1 'EVMS2: Adding support...' 
                        mkdir -p ${TEMP}/initrd-temp/lib