From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E3C3E13800E for ; Tue, 24 Jul 2012 06:29:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB220E062D; Tue, 24 Jul 2012 06:28:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AAA3DE062D for ; Tue, 24 Jul 2012 06:28:54 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DE5241B441B for ; Tue, 24 Jul 2012 06:28:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id AF3F5E5446 for ; Tue, 24 Jul 2012 06:28:51 +0000 (UTC) From: "Peter Hjalmarsson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Peter Hjalmarsson" Message-ID: <1343110976.b199b3f0fc72e67dbd77519a0f2e50c1718c3969.xake@gentoo> Subject: [gentoo-commits] proj/genkernel:xake commit in: / X-VCS-Repository: proj/genkernel X-VCS-Committer: xake X-VCS-Committer-Name: Peter Hjalmarsson X-VCS-Revision: b199b3f0fc72e67dbd77519a0f2e50c1718c3969 X-VCS-Branch: xake Date: Tue, 24 Jul 2012 06:28:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4e488825-30b9-47f2-8a77-4752b8590d0e X-Archives-Hash: 9de3a24b83d593e63bbd630849439c0a commit: b199b3f0fc72e67dbd77519a0f2e50c1718c3969 Author: Peter Hjalmarsson rymdraket net> AuthorDate: Tue Jul 24 06:22:56 2012 +0000 Commit: Peter Hjalmarsson rymdraket net> CommitDate: Tue Jul 24 06:22:56 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=b199b3f0 Merge remote-tracking branch 'origin/master' into xake Conflicts: genkernel ChangeLog | 127 +++++++++++++++++++ HACKING | 7 +- README | 3 +- arch/alpha/modules_load | 2 +- arch/arm/modules_load | 2 +- arch/ia64/modules_load | 2 +- arch/mips/modules_load | 2 +- arch/parisc/modules_load | 2 +- arch/parisc64/modules_load | 2 +- arch/ppc/modules_load | 2 +- arch/ppc64/modules_load | 2 +- arch/sparc/modules_load | 2 +- arch/sparc64/modules_load | 2 +- arch/um/modules_load | 2 +- arch/x86/kernel-config | 1 + arch/x86/modules_load | 4 +- arch/x86_64/kernel-config | 4 +- arch/x86_64/modules_load | 4 +- defaults/initrd.scripts | 79 ++++++++---- defaults/kernel-config | 1 + defaults/linuxrc | 115 +++++++++++++---- defaults/modprobe | 5 +- defaults/modules_load | 4 +- doc/genkernel.8.txt | 6 +- gen_bootloader.sh | 11 +- gen_cmdline.sh | 5 + gen_compile.sh | 38 +------ gen_configkernel.sh | 8 +- gen_determineargs.sh | 2 + gen_funcs.sh | 2 +- gen_initramfs.sh | 133 +++++++++++++++++--- gen_package.sh | 19 +++- genkernel | 26 +++-- genkernel.conf | 5 - .../busybox/{1.18.1 => 1.20.1}/1.18.1-openvt.diff | 0 .../busybox-1.20.1-mdstart.patch} | 30 +++--- .../busybox-1.7.4-signal-hack.patch | 0 .../1.42/e2fsprogs-1.41.12-getpagesize.patch | 42 ------ patches/fuse/2.8.6/fuse-2.8.6-glibc-2.14.patch | 10 ++ 39 files changed, 508 insertions(+), 205 deletions(-) diff --cc defaults/linuxrc index 7d770c9,f434339..fd3520b --- a/defaults/linuxrc +++ b/defaults/linuxrc @@@ -256,11 -255,34 +259,38 @@@ if [ -z "${REAL_ROOT}" -a \( "${CDROOT} then REAL_ROOT="${FAKE_ROOT}" fi +if [ -z "${REAL_INIT}" -a \( "${CDROOT}" = '0' \) -a \( "${FAKE_INIT}" != "/linuxrc" \) ] +then + REAL_INIT="${FAKE_INIT}" +fi + # Set variables based on the value of REAL_ROOT + case "${REAL_ROOT}" in + ZFS=*) + ZFS_POOL=${REAL_ROOT#*=} + ZFS_POOL=${ZFS_POOL%%/*} + USE_ZFS=1 + ;; + ZFS) + USE_ZFS=1 + ;; + esac + + # Verify that it is safe to use ZFS + if [ "USE_ZFS" = "1" ] + then + if [ -x /sbin/zfs -a -x /sbin/zpool ] + then + MY_HWOPTS="${MY_HWOPTS} zfs" + else + USE_ZFS=0 + + [ -x /sbin/zfs ] || bad_msg '/sbin/zfs not found!' + [ -x /sbin/zpool ] || bad_msg '/sbin/zpool not found!' + bad_msg 'Aborting use of zfs!' + fi + fi + splash 'init' cmdline_hwopts diff --cc genkernel index 823d9e3,b6f39e2..0840ead --- a/genkernel +++ b/genkernel @@@ -348,13 -351,23 +348,23 @@@ the [ "${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="' - [ "${ZFS}" = '1' ] && print_warning 1 'add "dozfs" for ZFS support' - [ "${ZFS}" = '1' ] && print_warning 1 ' and either "root=ZFS" to use bootfs autodetection or "root=ZFS=" to force booting from a specific dataset' + [ "${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=" to boot from a ZFS dataset' ++ [ "${ZFS}" = '1' ] && print_warning 1 'add either "root=ZFS" (bootfs autodetection) or "root=ZFS=" to boot from a ZFS dataset' [ "${ISCSI}" = '1' ] && print_warning 1 'add at least "iscsi_initiatorname= iscsi_target= and iscsi_address=" 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}