From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1KD8iT-0005sU-2k for mharc-grub-devel@gnu.org; Sun, 29 Jun 2008 22:02:05 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KD8iR-0005rw-1s for grub-devel@gnu.org; Sun, 29 Jun 2008 22:02:03 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KD8iM-0005pD-98 for grub-devel@gnu.org; Sun, 29 Jun 2008 22:02:02 -0400 Received: from [199.232.76.173] (port=36096 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KD8iL-0005p7-St for grub-devel@gnu.org; Sun, 29 Jun 2008 22:01:57 -0400 Received: from ug-out-1314.google.com ([66.249.92.175]:3798) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KD8iL-0002fB-6a for grub-devel@gnu.org; Sun, 29 Jun 2008 22:01:57 -0400 Received: by ug-out-1314.google.com with SMTP id l31so192343ugc.48 for ; Sun, 29 Jun 2008 19:01:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:content-type :date:message-id:mime-version:x-mailer; bh=fLZX8MtIZYZOV8gadAcOM/H1VCXC/odOvMOho48fTdg=; b=lt+n51msj3EaSRuPBIBltOHUDYZhyhRwIWwZ2NcR+qSQjGa7MqRGU4V0CCbMBHz8Cx 4y1nzFl+Xkgo0FEDdVu+MqcbBFY9cte3mhrC1pRfd/S6X0SWEF+xxo7//O+igPlS2AEV dXz+vijiN5QEq50g7O244NrKtvoTOJD8xbGSA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:content-type:date:message-id:mime-version:x-mailer; b=tlIvXBJbqzAIs2Qk4mbBlY9pwAA0dlPOh3qrkL9GIlvowV7rPW0NCaV5kCeQzJKDME F4wX4ydrw/ApbhsDIl0ORtQobxoB8wU/Rc6GyHPsuDDBS8pVfYozSWhPOy5fp8fZTb79 HHdqj47eZFZy6RDGkn7XrrHA6+B2pN/tYzCy0= Received: by 10.66.234.13 with SMTP id g13mr3472499ugh.68.1214791315841; Sun, 29 Jun 2008 19:01:55 -0700 (PDT) Received: from ?192.168.1.100? ( [213.37.137.93]) by mx.google.com with ESMTPS id 28sm113171ugc.79.2008.06.29.18.58.34 (version=SSLv3 cipher=RC4-MD5); Sun, 29 Jun 2008 19:00:15 -0700 (PDT) From: Javier =?ISO-8859-1?Q?Mart=EDn?= To: grub-devel@gnu.org Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-1uy9fDN6ouhNpm5Cd5GD" Date: Mon, 30 Jun 2008 03:58:34 +0200 Message-Id: <1214791114.9353.4.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.22.2 X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 2) Subject: [PATCH] Small fix in grub-setup X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jun 2008 02:02:03 -0000 --=-1uy9fDN6ouhNpm5Cd5GD Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Here goes a small fix to a grub-setup error that has driven /me crazy for the last 4 hours: in the recent split between core_path and core_path_dev, one occurrence of the former that should have been turned into the latter was not, thus making grub-setup spit lots of nonsensical (to me) "error: file not found" messages. I spent a big deal of time trying to debug the wrong piece of code, since I stubbornly thought that the error was in the "read-and-check" loop, while it really was later in the file... Sigh The fix is so simple that I post it directly here. If a ChangeLog entry is necessary, I'd propose "complete core_path variable split" or something along that lines. Index: util/i386/pc/grub-setup.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /sources/grub/grub2/util/i386/pc/grub-setup.c,v retrieving revision 1.39 diff -u -r1.39 grub-setup.c --- util/i386/pc/grub-setup.c 26 Jun 2008 15:29:32 -0000 1.39 +++ util/i386/pc/grub-setup.c 30 Jun 2008 01:53:00 -0000 @@ -452,7 +452,7 @@ } /* Now read the core image to determine where the sectors are. */ - file =3D grub_file_open (core_path); + file =3D grub_file_open (core_path_dev); if (! file) grub_util_error ("%s", grub_errmsg); --=-1uy9fDN6ouhNpm5Cd5GD Content-Type: application/pgp-signature; name=signature.asc Content-Description: Esta parte del mensaje =?ISO-8859-1?Q?est=E1?= firmada digitalmente -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iQIVAwUASGg9yqSl+Fbdeo72AQK5QRAAxCVhC+cRxR0nXlzAY7SbJAhRbT/ggS2q ECtuuqP82AskmHeyQ6MMRLlTE9yYJSNQyc1d6MsqwfbHlosVixQGf8toDWewwDfv 85p58lZmu4YO/HVV7KYmWMkmMeAHj+roeNizBmMMQL6mwD+sRQHJHLpx13MaDdhH rhQLVNIXZMF3BbuwQ05XZl969h5GbaoymCZywI6mFgqJXX+nOr9SkWHG9hQ7AOJe KUZ1M1IUDWFx+KkNhiwI4csGajuQnP8Ll60j6N/+WILY8gFtWTSOc7p3XdZgeubK zZBGq3ueTswoLYaxmFLuaIvQqEe8BD0bnk455JUGx/rZCkpF3ucA+KN+Mp+cpta5 mJjg07tvYW9dGgOXiLCLmeibWZ5dI0UeMP3JwrXCQbAE2820KCwUdpAtT93shDlb OQhG32LHhx2K2mKrhLwBOuHE0pMlXGeNlQ3r+XTT2oQMX0LyR0iho+/LRI/u4CW1 FpE/CNopucmyxhK+y8V96hQSWPW7S4P553y+opiWV1TOeFE8UL8E75rf1ChE0dzx 8lzHiqlRDbXi4pKsb6aDbjZr0+Wy/foymkDjJ9sKs55GzSSMWgPVytwChxsVfgOn AT4NPyt7X++G+V7WYefrl4LY3R3e5tYh8TWsOqt9eccXidDqPMGsQ1Q3zk5kzmdH iMDgj8ZBG8M= =oKej -----END PGP SIGNATURE----- --=-1uy9fDN6ouhNpm5Cd5GD--