From c49b5baa652fb8545d9157394bdce70f06f1e0a8 Mon Sep 17 00:00:00 2001
From: John Hay <jhay@FreeBSD.org>
Date: Mon, 17 Aug 2009 15:39:47 +0000
Subject: [PATCH] MFC: 196326 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)
---
 sys/boot/i386/gptboot/gptboot.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/sys/boot/i386/gptboot/gptboot.c b/sys/boot/i386/gptboot/gptboot.c
index 405b92e6286..89df2ecb104 100644
--- a/sys/boot/i386/gptboot/gptboot.c
+++ b/sys/boot/i386/gptboot/gptboot.c
@@ -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++;