Grub Development Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Christian Franke <Christian.Franke@t-online.de>
To: grub-devel@gnu.org
Subject: [PATCH] Fix grub.d/10_windows for Cygwin 1.7
Date: Wed, 05 May 2010 22:16:57 +0200	[thread overview]
Message-ID: <4BE1D239.8090207@t-online.de> (raw)

[-- Attachment #1: Type: text/html, Size: 335 bytes --]

[-- Attachment #2: grub2-10_windows.patch --]
[-- Type: text/x-patch, Size: 1826 bytes --]

=== 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  <franke@computer.org>
+
+	* 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  <phcoder@gmail.com>
 
 	* 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 <<EOF
+	drivemap -s (hd0) \$root
+EOF
   cat << EOF
 	chainloader +1
 }


             reply	other threads:[~2010-05-05 20:17 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-05 20:16 Christian Franke [this message]
2010-05-09 13:29 ` [PATCH] Fix grub.d/10_windows for Cygwin 1.7 Vladimir 'φ-coder/phcoder' Serbinenko
2010-05-09 14:37   ` Christian Franke
2010-05-09 14:56     ` Vladimir 'φ-coder/phcoder' Serbinenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4BE1D239.8090207@t-online.de \
    --to=christian.franke@t-online.de \
    --cc=grub-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox