From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1KQLQP-0001vo-Rb for mharc-grub-devel@gnu.org; Tue, 05 Aug 2008 08:14:01 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KQLQN-0001v9-4o for grub-devel@gnu.org; Tue, 05 Aug 2008 08:13:59 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KQLQL-0001un-Va for grub-devel@gnu.org; Tue, 05 Aug 2008 08:13:58 -0400 Received: from [199.232.76.173] (port=41783 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KQLQL-0001ui-OW for grub-devel@gnu.org; Tue, 05 Aug 2008 08:13:57 -0400 Received: from mailout09.t-online.de ([194.25.134.84]:56714) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KQLQL-0004Ik-7Y for grub-devel@gnu.org; Tue, 05 Aug 2008 08:13:57 -0400 Received: from fwd32.aul.t-online.de by mailout09.sul.t-online.de with smtp id 1KQLQJ-00058i-04; Tue, 05 Aug 2008 14:13:55 +0200 Received: from [10.3.2.2] (TECfDmZJohPGyAzrl6TS8Q0JYykqbxNknyDj2tbxnCKULghP59QVoL84LiwFbUxwa+@[217.235.205.75]) by fwd32.aul.t-online.de with esmtp id 1KQLQ5-2A7SxU0; Tue, 5 Aug 2008 14:13:41 +0200 Message-ID: <489843F7.1070303@t-online.de> Date: Tue, 05 Aug 2008 14:13:43 +0200 From: Christian Franke User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.16) Gecko/20080702 SeaMonkey/1.1.11 MIME-Version: 1.0 To: The development of GRUB 2 References: <4888E3C5.9090707@t-online.de> <4888E868.10404@t-online.de> <20080725204222.GE18149@thorin> <48922F66.4050803@t-online.de> <48975C7B.7060803@t-online.de> <20080804200002.GA28904@thorin> <48976922.3090109@t-online.de> <20080804214151.GB11798@thorin> In-Reply-To: <20080804214151.GB11798@thorin> Content-Type: multipart/mixed; boundary="------------010902060504020904030900" X-ID: TECfDmZJohPGyAzrl6TS8Q0JYykqbxNknyDj2tbxnCKULghP59QVoL84LiwFbUxwa+ X-TOI-MSGID: e480e46b-d99f-4170-83b4-707264903f30 X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3) Subject: Re: [PATCH] update-grub for Cygwin 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: Tue, 05 Aug 2008 12:13:59 -0000 This is a multi-part message in MIME format. --------------010902060504020904030900 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Robert Millan wrote: > On Mon, Aug 04, 2008 at 10:40:02PM +0200, Christian Franke wrote: > >> Robert Millan wrote: >> >>> On Mon, Aug 04, 2008 at 09:46:03PM +0200, Christian Franke wrote: >>> >>> >>>> Here a more generic version which allows to specifiy windows system dirs >>>> by /etc/default/grub:GRUB_WINDOWS_DIRS. >>>> >>>> Defaults to current SYSTEMDRIVE on Cygwin, and nothing on other OS. >>>> >>>> Christian >>>> >>>> 2008-08-04 Christian Franke >>>> >>>> * conf/common.rmk: Add `10_windows' to `update-grub_SCRIPTS'. >>>> * util/grub.d/10_windows.in: New file. >>>> * util/update-grub.in: Add export of GRUB_WINDOWS_DIRS. >>>> >>>> >>> Why is this needed? Can't we do something like 'grub-probe -t device >>> c:/ntldr' >>> or so? >>> >>> >>> >> It is not needed for standard installations with ntldr on SYSTEMDRIVE (C:). >> The ability to specify GRUB_WINDOWS_DIRS is added to support >> non-standard installations. >> It also allows to use 10_windows on other OS if os-prober is not available. >> > > Why not have the user write a custom entry then? I think it clutters the > user interface to add options for everything. If a corner case (boot a non > native disk, can't use os-prober) can be supported by creating a new config > file, why not do that? It was the whole reason for designing update-grub to > be easily extensible. > > Even with the new configuration parameter, user can still decide to leave the parameter unset and write a custom entry. Or the user can set the parameter and so "opt-in" to let the script do the work (or "opt-out" to disable the default work on Cygwin). But in case the extra 'export' in 'update-grub' is a problem, here a simplified version. Scans C: and SYSTEMDRIVE on Cygwin, does nothing elsewhere. Cannot be configured. Christian 2008-08-05 Christian Franke * conf/common.rmk: Add `10_windows' to `update-grub_SCRIPTS'. * util/grub.d/10_windows.in: New file. --------------010902060504020904030900 Content-Type: text/x-diff; name="grub2-10_windows-2.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="grub2-10_windows-2.patch" diff --git a/conf/common.rmk b/conf/common.rmk index 3d3cd8a..3d674a6 100644 --- a/conf/common.rmk +++ b/conf/common.rmk @@ -120,7 +120,7 @@ CLEANFILES += update-grub_lib %: util/grub.d/%.in config.status ./config.status --file=$@:$< chmod +x $@ -update-grub_SCRIPTS = 00_header 10_linux 10_hurd 30_os-prober 40_custom +update-grub_SCRIPTS = 00_header 10_linux 10_hurd 10_windows 30_os-prober 40_custom CLEANFILES += $(update-grub_SCRIPTS) update-grub_DATA += util/grub.d/README diff --git a/util/grub.d/10_windows.in b/util/grub.d/10_windows.in new file mode 100644 index 0000000..e8f3c3e --- /dev/null +++ b/util/grub.d/10_windows.in @@ -0,0 +1,83 @@ +#! /bin/sh -e + +# update-grub helper script. +# Copyright (C) 2008 Free Software Foundation, Inc. +# +# GRUB is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# GRUB is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GRUB. If not, see . + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +. ${libdir}/grub/update-grub_lib + +case "`uname 2>/dev/null`" in + CYGWIN*) ;; + *) exit 0 ;; +esac + +# Try C: even if current system is on other partition. +case "$SYSTEMDRIVE" in + [Cc]:) dirlist="C:" ;; + [D-Zd-z]:) dirlist="C: $SYSTEMDRIVE" ;; + *) exit 0 ;; +esac + +get_os_name_from_boot_ini () +{ + # Fail if no or more than one partition. + test "`sed -n 's,^\(\(multi\|scsi\)[^=]*\)=.*$,\1,p' "$1" 2>/dev/null | \ + sort | uniq | wc -l`" = 1 || return 1 + + # Search 'default=PARTITION' + local part=`sed -n 's,^default=,,p' "$1" | sed 's,\\\\,/,g;s,[ \t\r]*$,,;1q'` + test -n "$part" || return 1 + + # Search 'PARTITION="NAME" ...' + local name=`sed -n 's,\\\\,/,g;s,^'"$part"'="\([^"]*\)".*$,\1,p' "$1" | sed 1q` + test -n "$name" || return 1 + + echo "$name" +} + + +for dir in $dirlist ; do + + # Check for Vista bootmgr. + if [ -f "$dir"/bootmgr -a -f "$dir"/boot/bcd ] ; then + OS="Windows Vista bootmgr" + + # 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" + + else + continue + fi + + # Get boot /dev/ice. + dev=`${grub_probe} -t device "$dir" 2>/dev/null` || continue + + echo "Found $OS on $dir ($dev)" >&2 + cat << EOF +menuentry "$OS" { +EOF + + prepare_grub_to_access_device "$dev" | sed 's,^,\t,' + + cat << EOF + chainloader +1 +} +EOF +done + --------------010902060504020904030900--