Changed all instances of EVMS2/LVM2 to EVMS/LVM, respectively. This will keep everyt...

[genkernel.git] / genkernel

diff --git a/genkernel b/genkernel
index bd6dfa9124db96c164c1c7b8a9e64a7bbcb5aacc..2feab05ee93e21a0f7983a0ce0b516ac57c6f8e8 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # Genkernel v3
 
 PATH="/bin:/usr/bin:/sbin:/usr/sbin"
-GK_V='3.4.8'
+GK_V='3.4.9_pre2'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.
@@ -290,17 +290,12 @@ if [ "${BUILD_INITRD}" -eq '1' ]
 then
        [ "${DISKLABEL}" -eq '1' ] && compile_e2fsprogs
 
-       if [ "${KERN_24}" != '1' -a "${UDEV}" -eq '1' ] 
+       if [ "${KERN_24}" -eq '1' ] 
        then
-               :
-#              compile_udev 
-       else
-               DEVFS=1
-               UDEV=0
                compile_devfsd
        fi
 
-       if [ "${KERN_24}" != '1' -a  "${CMD_BOOTSPLASH}" != '1' ]
+       if [ "${KERN_24}" != '1' ]
        then
            if [ "${BUSYBOX}" -eq '1' ]
            then
@@ -350,7 +345,7 @@ then
                print_info 1 ''
                print_info 1 '    Where $ROOT is the device node for your root partition as the'
                print_info 1 '    one specified in /etc/fstab'
-       elif [ "${KERN_24}" != '1' -a  "${CMD_BOOTSPLASH}" != '1' ]
+       elif [ "${KERN_24}" != '1' ]
        then
                print_info 1 '    real_root=/dev/$ROOT'
                print_info 1 ''
@@ -380,10 +375,9 @@ then
        echo
        print_info 1 'WARNING... WARNING... WARNING...'
        print_info 1 'Additional kernel cmdline arguments that *may* be required to boot properly...'
-       [ "${GENSPLASH}" -eq '1' ] && print_info 1 "add \"vga=791 splash=silent,theme:${GENSPLASH_THEME} CONSOLE=/dev/tty1 quiet\" if you use a gensplash framebuffer ]"
-       [ "${BOOTSPLASH}" -eq '1' ] && print_info 1 'add "vga=791 splash=silent" if you use a bootsplash framebuffer'
-       [ "${LVM2}" -eq '1' ] && print_info 1 'add "dolvm2" for lvm2 support'
-       [ "${EVMS2}" -eq '1' ] && print_info 1 'add "doevms2" for evms support'
+       [ "${GENSPLASH}" -eq '1' ] && print_info 1 "add \"vga=791 splash=silent,theme:${GENSPLASH_THEME} console=tty1 quiet\" if you use a gensplash framebuffer ]"
+       [ "${LVM}" -eq '1' ] && print_info 1 'add "dolvm" for lvm support'
+       [ "${EVMS}" -eq '1' ] && print_info 1 'add "doevms" for evms support'
        [ "${DMRAID}" -eq '1' ] && print_info 1 'add "dodmraid" for dmraid support'
        [ "${DMRAID}" -eq '1' ] && print_info 1 '       or "dodmraid=<additional options>"'
        [ "${UNIONFS}" -eq '1' ] && print_info 1 'add "unionfs" for unionfs support'