From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1SHnjW-0008Bn-0C for mharc-grub-devel@gnu.org; Tue, 10 Apr 2012 22:56:34 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57188) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SHnjT-0008Aa-0l for grub-devel@gnu.org; Tue, 10 Apr 2012 22:56:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SHnjR-000626-7U for grub-devel@gnu.org; Tue, 10 Apr 2012 22:56:30 -0400 Received: from smtp.gentoo.org ([140.211.166.183]:57484) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SHnjR-00061r-1p for grub-devel@gnu.org; Tue, 10 Apr 2012 22:56:29 -0400 Received: from [192.168.0.4] (d14-69-47-19.try.wideopenwest.com [69.14.19.47]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: floppym) by smtp.gentoo.org (Postfix) with ESMTPSA id B697B1B4006 for ; Wed, 11 Apr 2012 02:56:25 +0000 (UTC) Message-ID: <4F84F2D4.9030305@gentoo.org> Date: Tue, 10 Apr 2012 22:56:20 -0400 From: Mike Gilbert User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:11.0) Gecko/20120329 Thunderbird/11.0.1 MIME-Version: 1.0 To: The development of GNU GRUB Subject: Re: Improve support for genkernel in 10_linux References: <4F80B7AE.9000607@gentoo.org> In-Reply-To: <4F80B7AE.9000607@gentoo.org> X-Enigmail-Version: 1.4 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------enigD03B35827EC3D90CAE54FCC3" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 140.211.166.183 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Apr 2012 02:56:32 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigD03B35827EC3D90CAE54FCC3 Content-Type: multipart/mixed; boundary="------------040508060003090006040703" This is a multi-part message in MIME format. --------------040508060003090006040703 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 04/07/2012 05:54 PM, Mike Gilbert wrote: > Secondly, genkernel looks for the "real_root" kernel command line optio= n > to determine the root filesystem. This is a holdover from the days when= > we used true initrd images and we needed to use root=3D/dev/ram0. >=20 It was brought to my attention that genkernel's initramfs code will in fact utilize "root" if "real_root" is unset. This part of my previous patch is therefore pointless. I have attached a revised patch containing only the changes necessary to detect a genkernel initramfs image. --------------040508060003090006040703 Content-Type: text/x-patch; name="grub-2.00-genkernel.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="grub-2.00-genkernel.patch" =3D=3D=3D modified file 'ChangeLog' --- ChangeLog 2012-04-07 18:11:04 +0000 +++ ChangeLog 2012-04-11 02:53:02 +0000 @@ -1,3 +1,7 @@ +2012-04-10 Mike Gilbert + + * util/grub.d/10_linux.in: Fix detection of genkernel initramfs. + 2012-04-07 Vladimir Serbinenko =20 * grub-core/normal/charset.c (grub_ucs4_to_utf8): Return number of =3D=3D=3D modified file 'util/grub.d/10_linux.in' --- util/grub.d/10_linux.in 2012-03-10 14:21:25 +0000 +++ util/grub.d/10_linux.in 2012-04-11 02:32:46 +0000 @@ -182,17 +182,19 @@ linux_root_device_thisversion=3D"${LINUX_ROOT_DEVICE}" =20 initrd=3D + pushd "${dirname}" > /dev/null for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${ver= sion}.gz" \ "initrd-${version}" "initramfs-${version}.img" \ "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ "initrd-${alt_version}" "initramfs-${alt_version}.img" \ - "initramfs-genkernel-${version}" \ - "initramfs-genkernel-${alt_version}"; do - if test -e "${dirname}/${i}" ; then + "initramfs-genkernel"*"-${version}" \ + "initramfs-genkernel"*"-${alt_version}"; do + if test -e "${i}" ; then initrd=3D"$i" break fi done + popd > /dev/null =20 config=3D for i in "${dirname}/config-${version}" "${dirname}/config-${alt_versi= on}" "/etc/kernels/kernel-config-${version}" ; do --------------040508060003090006040703-- --------------enigD03B35827EC3D90CAE54FCC3 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) iF4EAREIAAYFAk+E8tQACgkQC77qH+pIQ6Q/AAEAszTCWDZltGp2MLF0VdqNh6cW XmeXqZMTF4sRAdKqhL8A/1POuuR3BNA5ZeOiD/144Hr4T4+zazoeHm70whmiG5g4 =ZjZc -----END PGP SIGNATURE----- --------------enigD03B35827EC3D90CAE54FCC3--