svn commit: r341070 - stable/12/stand/i386/gptboot

[Ian Lepore]

Author: ian
Date: Tue Nov 27 16:13:56 2018
New Revision: 341070
URL: https://svnweb.freebsd.org/changeset/base/341070

Log:
  Revert r341069, I committed it to the wrong branch.

Modified:
  stable/12/stand/i386/gptboot/gptboot.c

Modified: stable/12/stand/i386/gptboot/gptboot.c
==============================================================================
--- stable/12/stand/i386/gptboot/gptboot.c	Tue Nov 27 16:09:16 2018	(r341069)
+++ stable/12/stand/i386/gptboot/gptboot.c	Tue Nov 27 16:13:56 2018	(r341070)
@@ -81,6 +81,7 @@ uint32_t opts;
 static const char *const dev_nm[NDEV] = {"ad", "da", "fd"};
 static const unsigned char dev_maj[NDEV] = {30, 4, 2};
 
+static struct dsk dsk;
 static char kname[1024];
 static int comspeed = SIOSPD;
 static struct bootinfo bootinfo;
@@ -568,22 +569,22 @@ parse_cmds(char *cmdstr, int *dskupdated)
 				    arg[1] != dev_nm[i][1]; i++)
 					if (i == NDEV - 1)
 						return (-1);
-				gdsk.dsk.type = i;
+				dsk.type = i;
 				arg += 3;
-				gdsk.dsk.unit = *arg - '0';
-				if (arg[1] != 'p' || gdsk.dsk.unit > 9)
+				dsk.unit = *arg - '0';
+				if (arg[1] != 'p' || dsk.unit > 9)
 					return (-1);
 				arg += 2;
-				gdsk.dsk.part = *arg - '0';
-				if (gdsk.dsk.part < 1 || gdsk.dsk.part > 9)
+				dsk.part = *arg - '0';
+				if (dsk.part < 1 || dsk.part > 9)
 					return (-1);
 				arg++;
 				if (arg[0] != ')')
 					return (-1);
 				arg++;
 				if (drv == -1)
-					drv = gdsk.dsk.unit;
-				gdsk.dsk.drive = (gdsk.dsk.type <= TYPE_MAXHARD
+					drv = dsk.unit;
+				dsk.drive = (dsk.type <= TYPE_MAXHARD
 				    ? DRV_HARD : 0) + drv;
 				*dskupdated = 1;
 			}