From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1O9l1v-0006ST-IN for mharc-grub-devel@gnu.org; Wed, 05 May 2010 16:17:15 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O9l1t-0006Qz-1f for grub-devel@gnu.org; Wed, 05 May 2010 16:17:13 -0400 Received: from [140.186.70.92] (port=53819 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O9l1q-0006PW-UU for grub-devel@gnu.org; Wed, 05 May 2010 16:17:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O9l1p-0005ZM-Ac for grub-devel@gnu.org; Wed, 05 May 2010 16:17:10 -0400 Received: from mailout06.t-online.de ([194.25.134.19]:59655) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O9l1p-0005ZA-2T for grub-devel@gnu.org; Wed, 05 May 2010 16:17:09 -0400 Received: from fwd03.aul.t-online.de (fwd03.aul.t-online.de ) by mailout06.t-online.de with smtp id 1O9l1i-0002pM-Hv; Wed, 05 May 2010 22:17:02 +0200 Received: from [192.168.2.100] (EIZcS2Z1ohHh+bm6Rnek8SNkBmgGBfm4RRAYSb2LZgGIVC2HtDHivpL4bMDbRcswMj@[79.224.112.76]) by fwd03.aul.t-online.de with esmtp id 1O9l1h-01pZCK0; Wed, 5 May 2010 22:17:01 +0200 Message-ID: <4BE1D239.8090207@t-online.de> Date: Wed, 05 May 2010 22:16:57 +0200 From: Christian Franke User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.1.9) Gecko/20100317 SeaMonkey/2.0.4 MIME-Version: 1.0 To: grub-devel@gnu.org Content-Type: multipart/mixed; boundary="------------000802080102030308020908" X-ID: EIZcS2Z1ohHh+bm6Rnek8SNkBmgGBfm4RRAYSb2LZgGIVC2HtDHivpL4bMDbRcswMj X-TOI-MSGID: 4e48a03f-84e2-4939-8574-3814a73d5af2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [PATCH] Fix grub.d/10_windows for Cygwin 1.7 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 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, 05 May 2010 20:17:13 -0000 This is a multi-part message in MIME format. --------------000802080102030308020908 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit This change is already included in Cygwin package grub-1.98-2.

--
Regards,
Christian Franke

--------------000802080102030308020908 Content-Type: text/x-patch; name="grub2-10_windows.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="grub2-10_windows.patch" === modified file 'ChangeLog' --- ChangeLog 2010-05-05 19:19:55 +0000 +++ ChangeLog 2010-05-05 20:09:01 +0000 @@ -1,3 +1,9 @@ +2010-05-05 Christian Franke + + * util/grub.d/10_windows.in: Use path names instead of + drive letters to prevent warning from Cygwin 1.7. + Add drivemap command to menuentry if needed. + 2010-05-05 Vladimir Serbinenko * video/readers/jpeg.c: Indented. === modified file 'util/grub.d/10_windows.in' --- util/grub.d/10_windows.in 2009-11-20 08:41:20 +0000 +++ util/grub.d/10_windows.in 2010-05-05 12:22:43 +0000 @@ -28,8 +28,8 @@ # Try C: even if current system is on other partition. case "$SYSTEMDRIVE" in - [Cc]:) dirlist="C:" ;; - [D-Zd-z]:) dirlist="C: $SYSTEMDRIVE" ;; + [Cc]:) drives="C:" ;; + [D-Zd-z]:) drives="C: $SYSTEMDRIVE" ;; *) exit 0 ;; esac @@ -51,7 +51,13 @@ } -for dir in $dirlist ; do +for drv in $drives ; do + + # Convert to Cygwin path. + dir=`cygpath "$drv"` + test -n "$dir" || continue + + needmap= # Check for Vista bootmgr. if [ -f "$dir"/bootmgr -a -f "$dir"/boot/bcd ] ; then @@ -60,6 +66,7 @@ # Check for NTLDR. elif [ -f "$dir"/ntldr -a -f "$dir"/ntdetect.com -a -f "$dir"/boot.ini ] ; then OS=`get_os_name_from_boot_ini "$dir"/boot.ini` || OS="Windows NT/2000/XP loader" + needmap=t else continue @@ -68,14 +75,16 @@ # Get boot /dev/ice. dev=`${grub_probe} -t device "$dir" 2>/dev/null` || continue - echo "Found $OS on $dir ($dev)" >&2 + echo "Found $OS on $drv ($dev)" >&2 cat << EOF menuentry "$OS" { EOF save_default_entry | sed -e 's,^,\t,' prepare_grub_to_access_device "$dev" | sed 's,^,\t,' - + test -z "$needmap" || cat <