Bump to 3.4.33.1

[genkernel.git] / genkernel

diff --git a/genkernel b/genkernel
index 6ae223e5337f14883d8dd6fc2e81303ec959d5b0..13914a169dbbd74bbad1843f59eee177e627f0c0 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='3.4.10.909'
+GK_V='3.4.33.1'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.
@@ -131,7 +131,7 @@ dump_debugcache
 NORMAL=${BOLD} print_info 1 "Linux Kernel ${BOLD}${KV}${NORMAL} for ${BOLD}${ARCH}${NORMAL}..."
 
 # Check BOOTDIR is mounted
-if isTrue ${CMD_NOINSTALL}
+if ! isTrue ${CMD_INSTALL}
 then
        isTrue ${MOUNTBOOT} && print_info 2 'Skipping automatic mount of boot'
 else
@@ -230,7 +230,7 @@ then
        fi
 fi
 
-if ! isTrue "${CMD_NOINSTALL}"
+if isTrue "${CMD_INSTALL}"
 then
        if [ "${KERNCACHE}" != "" -a "${KERNCACHE_IS_VALID}" != "0" ] 
        then
@@ -279,8 +279,6 @@ fi
 
 if [ "${BUILD_RAMDISK}" = '1' ]
 then
-       [ "${DISKLABEL}" = '1' ] && compile_e2fsprogs
-
        if [ "${BUSYBOX}" = '1' ]
        then
                # Compile Busybox
@@ -313,7 +311,7 @@ fi
 
 if [ "${BUILD_KERNEL}" = '1' ]
 then
-       if ! isTrue "${CMD_NOINSTALL}"
+       if isTrue "${CMD_INSTALL}"
        then
                set_bootloader
        fi
@@ -344,14 +342,20 @@ fi
 if [ "${BUILD_RAMDISK}" = '1' ]
 then
        echo
-       print_info 1 'WARNING... WARNING... WARNING...'
-       print_info 1 'Additional kernel cmdline arguments that *may* be required to boot properly...'
-       [ "${SPLASH}" = '1' ] && print_info 1 "add \"vga=791 splash=silent,theme:${SPLASH_THEME} console=tty1 quiet\" if you use a splash framebuffer ]"
-       [ "${LVM}" = '1' ] && print_info 1 'add "dolvm" for lvm support'
-       [ "${EVMS}" = '1' ] && print_info 1 'add "doevms" for evms support'
-       [ "${DMRAID}" = '1' ] && print_info 1 'add "dodmraid" for dmraid support'
-       [ "${DMRAID}" = '1' ] && print_info 1 ' or "dodmraid=<additional options>"'
-       [ "${ISCSI}" = '1' ] && print_info 1 'add at least "iscsi_initiatorname=<initiator name> iscsi_target=<target name> and iscsi_address=<target ip>" for iscsi support'
+       print_warning 1 'WARNING... WARNING... WARNING...'
+       print_warning 1 'Additional kernel cmdline arguments that *may* be required to boot properly...'
+       [ "${SPLASH}" = '1' ] && print_warning 1 "add \"vga=791 splash=silent,theme:${SPLASH_THEME} console=tty1 quiet\" if you use a splash framebuffer ]"
+       [ "${LVM}" = '1' ] && print_warning 1 'add "dolvm" for lvm support'
+       [ "${DMRAID}" = '1' ] && print_warning 1 'add "dodmraid" for dmraid support'
+       [ "${MDADM}" = '1' ] && print_warning 1 'add "domdadm" for RAID support'
+       [ "${DMRAID}" = '1' ] && print_warning 1 '      or "dodmraid=<additional options>"'
+       [ "${ZFS}" = '1' ] && print_warning 1 'add "dozfs" for ZFS volume management support'
+       [ "${ZFS}" = '1' ] && print_warning 1 'add either "real_root=ZFS" (bootfs autodetection) or "real_root=ZFS=<dataset>" to boot from a ZFS dataset'
+       [ "${ISCSI}" = '1' ] && print_warning 1 'add at least "iscsi_initiatorname=<initiator name> iscsi_target=<target name> and iscsi_address=<target ip>" for iscsi support'
+       if [ `grep 'CONFIG_EXT[0-9]_FS=' "${KERNEL_DIR}"/.config | wc -l` -ge 2 ]; then
+               print_warning 1 'With support for several ext* filesystems around it may be needed to'
+               print_warning 1 'add "rootfstype=ext3" or "rootfstype=ext4"'
+       fi
 fi
 
 [ "${BOOTRW}" != '' ] && mount -o remount,ro ${BOOTDIR}
@@ -360,7 +364,7 @@ echo
 print_info 1 'Do NOT report kernel bugs as genkernel bugs unless your bug'
 print_info 1 'is about the default genkernel configuration...'
 print_info 1 ''
-print_info 1 'Make sure you have the latest genkernel before reporting bugs.'
+print_info 1 'Make sure you have the latest ~arch genkernel before reporting bugs.'
 
 #Final Cleanup
 cleanup