From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UiRMf-0003QY-7Q for mharc-grub-devel@gnu.org; Fri, 31 May 2013 11:35:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49199) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UiRMb-0003Ou-IW for grub-devel@gnu.org; Fri, 31 May 2013 11:35:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UiRMZ-000450-95 for grub-devel@gnu.org; Fri, 31 May 2013 11:35:33 -0400 Received: from mail-la0-x22c.google.com ([2a00:1450:4010:c03::22c]:63100) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UiQdK-0006tx-I2 for grub-devel@gnu.org; Fri, 31 May 2013 10:48:46 -0400 Received: by mail-la0-f44.google.com with SMTP id ek20so1464620lab.17 for ; Fri, 31 May 2013 07:48:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:subject:message-id:in-reply-to:references:x-mailer :mime-version:content-type:content-transfer-encoding; bh=ECNVM6hRsIzkkvNvDTnYQMUQijxK04cwfLpPqW5C+BQ=; b=0iCnRUm4aSfto0mRqpjtfmSshBRY2gXlz+/rhqw2KkiqKj15wvRLX4pNp9ra5maf1c nMXiagFdcs4sQoRwPgdekspaBqG88oK4XH3YnnMD7F6AuZmI9hEihDVL5yg08y9Nw0+R 5sQ1eW7wKFoDQlY/WdFaeZsrXA9ht+zW9plnOgW8jsaKHxsHZ4AFvhKnONtDh0ESCuJM atswOJWgaYui9+p0IEndrWspeQG/1TZutqURpNaiwpYkm+u/Lqxp0OLpGxwqDUS0zP2m ea7h5nuU8FmL/7QPvzmJURnL78trbQsL8lro7fJ5Z8KUJ6iVy7OtLE0aZAKKa6dZ7NB3 vF1A== X-Received: by 10.112.188.161 with SMTP id gb1mr6100500lbc.107.1370011724883; Fri, 31 May 2013 07:48:44 -0700 (PDT) Received: from opensuse.site (ppp79-139-160-84.pppoe.spdop.ru. [79.139.160.84]) by mx.google.com with ESMTPSA id e3sm18921919lbf.17.2013.05.31.07.48.44 for (version=SSLv3 cipher=RC4-SHA bits=128/128); Fri, 31 May 2013 07:48:44 -0700 (PDT) Date: Fri, 31 May 2013 18:48:43 +0400 From: Andrey Borzenkov To: grub-devel@gnu.org Subject: Re: [RFC] Support for UEFI ESP in os-prober Message-ID: <20130531184843.235759e8@opensuse.site> In-Reply-To: References: <1348931070.2008.14.camel@opensuse.site> X-Mailer: Claws Mail 3.9.0 (GTK+ 2.24.18; x86_64-suse-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::22c X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 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: Fri, 31 May 2013 15:35:35 -0000 =D0=92 Mon, 1 Oct 2012 13:25:50 +0200 "Vladimir 'phcoder' Serbinenko" =D0=BF=D0=B8=D1=88=D0= =B5=D1=82: > I haven=E2=80=98t had time to view in details but os-prober isn=E2=80=98t= managed by us but > by debian-boot team so you need to contact them. Also I=E2=80=98d prefer = more of > detection to be done on runtime than it=E2=80=98s done in current model In the meantime os-prober part is integrated in Debian as of 1.58. The patch adds missing part from grub2 side. How does it look like? --- ChangeLog | 5 +++++ util/grub.d/30_os-prober.in | 16 ++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/ChangeLog b/ChangeLog index e9ef17e..798369d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-05-31 Andrey Borzenkov + + * util/grub.d/30_os-prober.in: Add support for probing EFI + System Partition (as of os-prober 1.58). + 2013-05-30 Josh Triplett =20 * grub-core/normal/cmdline.c (grub_cmdline_get): Fix Ctrl-u diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in index 04f32a1..5e3c5d8 100644 --- a/util/grub.d/30_os-prober.in +++ b/util/grub.d/30_os-prober.in @@ -149,6 +149,22 @@ EOF } EOF ;; + efi) + + EFIPATH=3D${DEVICE#*@} + DEVICE=3D${DEVICE%@*} + onstr=3D"$(gettext_printf "(on %s)" "${DEVICE}")" + cat << EOF +menuentry '$(echo "${LONGNAME} $onstr" | grub_quote)' --class windows --cl= ass os \$menuentry_id_option 'osprober-efi-$(grub_get_device_id "${DEVICE}"= )' { +EOF + save_default_entry | sed -e "s/^/\t/" + prepare_grub_to_access_device ${DEVICE} | sed -e "s/^/\t/" + + cat < /dev/null | tr ' ' '^' | paste -s -d ' '`" --=20 tg: (f434947..) u/os-prober-efi (depends on: master)