From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1Snza4-0003sW-Vm for garchives@archives.gentoo.org; Sun, 08 Jul 2012 22:03:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E7ECEE05ED; Sun, 8 Jul 2012 22:03:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BABA1E05ED for ; Sun, 8 Jul 2012 22:03:25 +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 2EF3F1B401A for ; Sun, 8 Jul 2012 22:03:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E85E9E5433 for ; Sun, 8 Jul 2012 22:03:23 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1341784902.88892f5df2453f959539c444a4d0ac161ec70d8f.sping@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_initramfs.sh genkernel X-VCS-Directories: / X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 88892f5df2453f959539c444a4d0ac161ec70d8f X-VCS-Branch: master Date: Sun, 8 Jul 2012 22:03:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 14d02768-8dc5-403c-a981-7b55eb128fda X-Archives-Hash: 2c5e66cc5d861a0c5b5c841d10e7a71a commit: 88892f5df2453f959539c444a4d0ac161ec70d8f Author: Sebastian Pipping pipping org> AuthorDate: Sun Jul 8 21:39:10 2012 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Sun Jul 8 22:01:42 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3D88892f5d Use proper ${KERNEL_CONFIG} rather than ${KERNEL_DIR}/.config as input --- gen_initramfs.sh | 9 ++++++++- genkernel | 12 +++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/gen_initramfs.sh b/gen_initramfs.sh index f0b63d9..9ccd5f3 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -754,6 +754,13 @@ create_initramfs() { else if isTrue "${COMPRESS_INITRD}" then + if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}")" =3D=3D applica= tion/x-gzip ]]; then + # Support --kernel-config=3D/proc/config.gz, mainly + local CONFGREP=3Dzgrep + else + local CONFGREP=3Dgrep + fi + cmd_xz=3D$(type -p xz) cmd_lzma=3D$(type -p lzma) cmd_bzip2=3D$(type -p bzip2) @@ -778,7 +785,7 @@ create_initramfs() { set -- ${tuple} kernel_option=3D$1 cmd_variable_name=3D$2 - if grep -sq "^${kernel_option}=3Dy" ${KERNEL_DIR}/.config && test = -n "${!cmd_variable_name}" ; then + if ${CONFGREP} -q "^${kernel_option}=3Dy" "${KERNEL_CONFIG}" && te= st -n "${!cmd_variable_name}" ; then compression=3D$3 [[ ${COMPRESS_INITRD_TYPE} =3D=3D best ]] && break fi diff --git a/genkernel b/genkernel index 61dd493..103c434 100755 --- a/genkernel +++ b/genkernel @@ -352,10 +352,20 @@ then [ "${ZFS}" =3D '1' ] && print_warning 1 'add "dozfs" for ZFS volume man= agement support' [ "${ZFS}" =3D '1' ] && print_warning 1 'add either "real_root=3DZFS" (= bootfs autodetection) or "real_root=3DZFS=3D" to boot from a ZFS= dataset' [ "${ISCSI}" =3D '1' ] && print_warning 1 'add at least "iscsi_initiato= rname=3D iscsi_target=3D and iscsi_address=3D= " for iscsi support' - if [ `grep 'CONFIG_EXT[0-9]_FS=3D' "${KERNEL_DIR}"/.config | wc -l` -ge= 2 ]; then + + if [[ "$(file --brief --mime-type "${KERNEL_CONFIG}")" =3D=3D applicati= on/x-gzip ]]; then + # Support --kernel-config=3D/proc/config.gz, mainly + CONFGREP=3Dzgrep + else + CONFGREP=3Dgrep + fi + + if [ `${CONFGREP} 'CONFIG_EXT[0-9]_FS=3D' "${KERNEL_CONFIG}" | wc -l` -= ge 2 ]; then print_warning 1 'With support for several ext* filesystems around it m= ay be needed to' print_warning 1 'add "rootfstype=3Dext3" or "rootfstype=3Dext4"' fi + + unset CONFGREP fi =20 [ "${BOOTRW}" !=3D '' ] && mount -o remount,ro ${BOOTDIR}