Author: kevans
Date: Thu Aug 9 02:06:25 2018
New Revision: 337520
URL: https://svnweb.freebsd.org/changeset/base/337520
Log:
isoboot, gptboot: Fix WITHOUT_LOADER_GELI (gptboot) and isoboot in general
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: guy...@gmail.com
MFC after: 1 week
Modified:
head/stand/i386/gptboot/gptboot.c
head/stand/i386/isoboot/isoboot.c
Modified: head/stand/i386/gptboot/gptboot.c
==============================================================================
--- head/stand/i386/gptboot/gptboot.c Thu Aug 9 01:39:47 2018
(r337519)
+++ head/stand/i386/gptboot/gptboot.c Thu Aug 9 02:06:25 2018
(r337520)
@@ -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
);
}
Modified: head/stand/i386/isoboot/isoboot.c
==============================================================================
--- head/stand/i386/isoboot/isoboot.c Thu Aug 9 01:39:47 2018
(r337519)
+++ head/stand/i386/isoboot/isoboot.c Thu Aug 9 02:06:25 2018
(r337520)
@@ -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
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
