Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1Mn9iI-0001Hf-5D for mharc-grub-devel@gnu.org; Mon, 14 Sep 2009 07:27:18 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mn9iF-0001HI-6Z for grub-devel@gnu.org; Mon, 14 Sep 2009 07:27:15 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mn9iA-0001Gq-Ig for grub-devel@gnu.org; Mon, 14 Sep 2009 07:27:14 -0400 Received: from [199.232.76.173] (port=56385 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mn9iA-0001Gm-ES for grub-devel@gnu.org; Mon, 14 Sep 2009 07:27:10 -0400 Received: from smarthost02.mail.zen.net.uk ([212.23.3.141]:41401) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mn9iA-0002D7-1f for grub-devel@gnu.org; Mon, 14 Sep 2009 07:27:10 -0400 Received: from [82.69.40.219] (helo=riva.pelham.vpn.ucam.org) by smarthost02.mail.zen.net.uk with esmtp (Exim 4.63) (envelope-from ) id 1Mn9i8-0004Ex-SJ for grub-devel@gnu.org; Mon, 14 Sep 2009 11:27:08 +0000 Received: from cjwatson by riva.pelham.vpn.ucam.org with local (Exim 3.36 #1 (Debian)) for grub-devel@gnu.org id 1Mn9i6-0001aW-00; Mon, 14 Sep 2009 12:27:06 +0100 Date: Mon, 14 Sep 2009 12:27:06 +0100 From: Colin Watson To: grub-devel@gnu.org Message-ID: <20090914112706.GL13423@riva.ucam.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) X-Originating-Smarthost02-IP: [82.69.40.219] X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [PATCH] Cope with Windows 7 in os-prober output 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, 14 Sep 2009 11:27:15 -0000 I recently fixed https://bugs.launchpad.net/ubuntu/+source/os-prober/+bug/393565 in os-prober svn. GRUB needs this patch to handle the new output correctly. 2009-09-14 Colin Watson * util/grub.d/30_os-prober.in: Cope with Windows 7 in os-prober output. Index: util/grub.d/30_os-prober.in =================================================================== --- util/grub.d/30_os-prober.in (revision 2593) +++ util/grub.d/30_os-prober.in (working copy) @@ -57,11 +57,16 @@ menuentry "${LONGNAME} (on ${DEVICE})" { EOF prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/" - if [ "${LONGNAME}" != "Windows Vista (loader)" ] ; then - cat << EOF + case ${LONGNAME} in + Windows\ Vista*|Windows\ 7*) + ;; + *) + cat << EOF drivemap -s (hd0) \${root} EOF - fi + ;; + esac + cat <