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

[genkernel.git] / genkernel

diff --git a/genkernel b/genkernel
index 3a238763f28f5a3dbdabd89d395e9f849bcc7d05..2feab05ee93e21a0f7983a0ce0b516ac57c6f8e8 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -2,10 +2,12 @@
 # Genkernel v3
 
 PATH="/bin:/usr/bin:/sbin:/usr/sbin"
-GK_V='3.4.7_pre3'
+GK_V='3.4.9_pre2'
 
+# Set the default for TMPDIR.  May be modified by genkernel.conf or the
+# --tempdir command line option.
 TMPDIR='/var/tmp/genkernel'
-TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$
+
 TODEBUGCACHE=1 # Until an error occurs or DEBUGFILE is fully qualified.
 
 small_die() {
@@ -26,6 +28,8 @@ source ${GK_BIN}/gen_moddeps.sh || gen_die "Could not read ${GK_BIN}/gen_moddeps
 source ${GK_BIN}/gen_package.sh || gen_die "Could not read ${GK_BIN}/gen_package.sh"
 source ${GK_BIN}/gen_bootloader.sh || gen_die "Could not read ${GK_BIN}/gen_bootloader.sh"
 
+TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$
+
 trap_cleanup(){
        # Call exit code of 1 for failure
        cleanup
@@ -284,31 +288,14 @@ fi
 
 if [ "${BUILD_INITRD}" -eq '1' ]
 then
-       # Only compile insmod if we're installing modules onto the initrd
-       if [ "${NOINITRDMODULES}" = '' ]
-       then
-               if [ "${KERN_24}" != '1' ]
-               then
-                       # Compile module-init-tools
-                       [ ${BUILD_STATIC} -eq 0 ] && compile_module_init_tools
-               else
-                       [ ${BUILD_STATIC} -eq 0 ] && compile_modutils
-               fi
-       fi
-       
        [ "${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
@@ -358,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 ''
@@ -388,70 +375,15 @@ 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'
        [ "${UNIONFS}" -eq '1' ] && print_info 1 '      or "unionfs=<block_device>"'
 fi
 
-
-symlinker() {
-       local base=$1
-       local fullVer=${KNAME}-${ARCH}-${KV}
-
-       local newThing=${BOOTDIR}/${base}-${fullVer}
-       local newSym=${BOOTDIR}/${base}
-       local oldSym=${newSym}.old
-
-       local prevLink
-       local ret=0
-
-       print_info 1 "      creating ${base} name symlink!"
-       if [ -e ${newThing} ] ; then
-               if [ -L ${newSym} ] ; then
-                       prevLink=`readlink --no-newline ${newSym}`
-                       if [ ${prevLink} != ${newThing} ] ; then
-                               if [ -L ${oldSym} ] ; then
-                                       rm ${oldSym}
-                               fi
-                               ln -s ${prevLink} ${oldSym}
-                               [ $((ret += $?)) ]
-                       fi
-                       rm ${newSym}
-               fi
-               ln -s ${newThing} ${newSym}
-               [ $((ret += $?)) ]
-       fi
-       
-       if [[ ${ret} > 0 ]] ; then
-               print_error 1 "     $base link failed: ${ret}"
-       fi
-
-       return ${ret}
-}
-
-
-if [ "${CMD_NOINSTALL}" != '1' -a "${SYMLINK}" = '1' ]
-then 
-    echo
-    print_info 1 'Creating symlinks'
-    
-    
-       symlinker kernel
-       symlinker System.map 
-
-       if [ "${KERN_24}" != '1' -a  "${CMD_BOOTSPLASH}" != '1' ] ; then
-               symlinker initramfs
-       else
-               symlinker initrd
-    fi
-fi
-
-
 [ "${BOOTRW}" != '' ] && mount -o remount,ro ${BOOTDIR}
 
 echo