From owner-svn-src-head@FreeBSD.ORG Mon Aug 17 15:19:03 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 67A54106568F;
Mon, 17 Aug 2009 15:19:03 +0000 (UTC)
(envelope-from jhay@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 5753C8FC57;
Mon, 17 Aug 2009 15:19:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7HFJ3tJ081729;
Mon, 17 Aug 2009 15:19:03 GMT (envelope-from jhay@svn.freebsd.org)
Received: (from jhay@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7HFJ351081727;
Mon, 17 Aug 2009 15:19:03 GMT (envelope-from jhay@svn.freebsd.org)
Message-Id: <200908171519.n7HFJ351081727@svn.freebsd.org>
From: John Hay <jhay@FreeBSD.org>
Date: Mon, 17 Aug 2009 15:19:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r196326 - head/sys/boot/i386/gptboot
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Aug 2009 15:19:03 -0000
Author: jhay
Date: Mon Aug 17 15:19:03 2009
New Revision: 196326
URL: http://svn.freebsd.org/changeset/base/196326
Log:
Fix parse() so that the partition to boot (load /boot/loader) from can
be set. The syntax as printed in main() is used: 0:ad(0p3)/boot/loader
Reviewed by: jhb
Approved by: re (kib)
Modified:
head/sys/boot/i386/gptboot/gptboot.c
Modified: head/sys/boot/i386/gptboot/gptboot.c
==============================================================================
--- head/sys/boot/i386/gptboot/gptboot.c Mon Aug 17 14:53:59 2009 (r196325)
+++ head/sys/boot/i386/gptboot/gptboot.c Mon Aug 17 15:19:03 2009 (r196326)
@@ -466,16 +466,13 @@ parse(void)
dsk.type = i;
arg += 3;
dsk.unit = *arg - '0';
- if (arg[1] != ',' || dsk.unit > 9)
+ if (arg[1] != 'p' || dsk.unit > 9)
return -1;
arg += 2;
- dsk.part = -1;
- if (arg[1] == ',') {
- dsk.part = *arg - '0';
- if (dsk.part < 1 || dsk.part > 9)
- return -1;
- arg += 2;
- }
+ dsk.part = *arg - '0';
+ if (dsk.part < 1 || dsk.part > 9)
+ return -1;
+ arg++;
if (arg[0] != ')')
return -1;
arg++;