X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=genkernel;h=b6f39e2ae3d5bb43fa91eaa070875c8ed0abc4cd;hb=c79d57926f31184c526989d0076b0649ad862039;hp=8a42bf06c224d0f70dfd5a3d6d3d1a051cafec02;hpb=aea5074809e40b6e8f582d367a271b86fd1d651b;p=genkernel.git

diff --git a/genkernel b/genkernel
index 8a42bf0..b6f39e2 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # $Id$
 
 PATH="${PATH}:/sbin:/usr/sbin"
-GK_V='3.4.17'
+GK_V='3.4.39'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.
@@ -117,6 +117,7 @@ done
 # get the real arguments for usage...
 
 determine_real_args
+determine_config_file
 
 set_kernel_arch
 
@@ -129,9 +130,10 @@ check_distfiles
 dump_debugcache
 
 NORMAL=${BOLD} print_info 1 "Linux Kernel ${BOLD}${KV}${NORMAL} for ${BOLD}${ARCH}${NORMAL}..."
+print_info 1 ".. with config file ${KERNEL_CONFIG}"
 
 # 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 +232,7 @@ then
 	fi
 fi
 
-if ! isTrue "${CMD_NOINSTALL}"
+if isTrue "${CMD_INSTALL}"
 then
 	if [ "${KERNCACHE}" != "" -a "${KERNCACHE_IS_VALID}" != "0" ] 
 	then
@@ -279,8 +281,6 @@ fi
 
 if [ "${BUILD_RAMDISK}" = '1' ]
 then
-	[ "${DISKLABEL}" = '1' ] && compile_e2fsprogs
-
 	if [ "${BUSYBOX}" = '1' ]
 	then
 		# Compile Busybox
@@ -313,7 +313,7 @@ fi
 
 if [ "${BUILD_KERNEL}" = '1' ]
 then
-	if ! isTrue "${CMD_NOINSTALL}"
+	if isTrue "${CMD_INSTALL}"
 	then
 		set_bootloader
 	fi
@@ -351,11 +351,23 @@ then
 	[ "${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"'
+
+	if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}")" == application/x-gzip ]]; then
+		# Support --kernel-config=/proc/config.gz, mainly
+		CONFGREP=zgrep
+	else
+		CONFGREP=grep
 	fi
+
+	if [ `${CONFGREP} 'CONFIG_EXT[0-9]_FS=' "${KERNEL_CONFIG}" | wc -l` -ge 2 ]; then
+		print_warning 1 'With support for several ext* filesystems available, it may be needed to'
+		print_warning 1 'add "rootfstype=ext3" or "rootfstype=ext4" to the list of boot parameters.'
+	fi
+
+	unset CONFGREP
 fi
 
 [ "${BOOTRW}" != '' ] && mount -o remount,ro ${BOOTDIR}