d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

isoboot, gptboot: Fix WITHOUT_LOADER_GELI (gptboot) and isoboot in general

Browse Source 
gptboot was broken when r316078 added the LOADER_GELI_SUPPORT #ifdef to
not pass geliargs via __exec.  KARGS_FLAGS_EXTARG must not be used if we're
not going to pass an additional argument to __exec.

PR:		228151
Submitted by:	guyyur@gmail.com
MFC after:	1 week
This commit is contained in:
Kyle Evans 2018-08-09 02:06:25 +00:00
parent 2834d61202
commit 4e6c8e6d83
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
stand/i386/gptboot/gptboot.c
View File

@ -490,9 +490,10 @@ load(void)
#endif
__exec((caddr_t)addr, RB_BOOTINFO | (opts & RBX_MASK),
MAKEBOOTDEV(dev_maj[gdsk.dsk.type], gdsk.dsk.part + 1, gdsk.dsk.unit, 0xff),
KARGS_FLAGS_EXTARG, 0, 0, VTOP(&bootinfo)
#ifdef LOADER_GELI_SUPPORT
, geliargs
KARGS_FLAGS_EXTARG, 0, 0, VTOP(&bootinfo), geliargs
#else
0, 0, 0, VTOP(&bootinfo)
#endif
);
}

2
stand/i386/isoboot/isoboot.c
View File

@ -417,7 +417,7 @@ load(void)
bootinfo.bi_bios_dev = dsk.drive;
__exec((caddr_t)addr, RB_BOOTINFO | (opts & RBX_MASK),
MAKEBOOTDEV(dev_maj[dsk.type], 0, dsk.unit, 0),
KARGS_FLAGS_EXTARG, 0, 0, VTOP(&bootinfo));
0, 0, 0, VTOP(&bootinfo));
}
static int