Date: Tue, 14 Aug 2018 13:16:25 -0700 (PDT) From: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net> To: Kyle Evans <kevans@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r337816 - in stable/11/stand/i386: gptboot isoboot Message-ID: <201808142016.w7EKGPiZ044105@pdx.rh.CN85.dnsmgr.net> In-Reply-To: <201808141944.w7EJiaAv090670@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[ Charset UTF-8 unsupported, converting... ] > Author: kevans > Date: Tue Aug 14 19:44:36 2018 > New Revision: 337816 > URL: https://svnweb.freebsd.org/changeset/base/337816 > > Log: > MFC r337520: Fix WITHOUT_LOADER_GELI (gptboot) and isoboot in general ^^^^^^^^^^^^^^^^ This fixes the hybrid mode .iso build so that you can dd the disc1.iso to a USB memory stick and boot it. You no longer need a "special" memory image. > > 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 > > Modified: > stable/11/stand/i386/gptboot/gptboot.c > stable/11/stand/i386/isoboot/isoboot.c > Directory Properties: > stable/11/ (props changed) > > Modified: stable/11/stand/i386/gptboot/gptboot.c > ============================================================================== > --- stable/11/stand/i386/gptboot/gptboot.c Tue Aug 14 19:42:18 2018 (r337815) > +++ stable/11/stand/i386/gptboot/gptboot.c Tue Aug 14 19:44:36 2018 (r337816) > @@ -482,9 +482,10 @@ load(void) > #endif > __exec((caddr_t)addr, RB_BOOTINFO | (opts & RBX_MASK), > MAKEBOOTDEV(dev_maj[dsk.type], dsk.part + 1, 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: stable/11/stand/i386/isoboot/isoboot.c > ============================================================================== > --- stable/11/stand/i386/isoboot/isoboot.c Tue Aug 14 19:42:18 2018 (r337815) > +++ stable/11/stand/i386/isoboot/isoboot.c Tue Aug 14 19:44:36 2018 (r337816) > @@ -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 > > -- Rod Grimes rgrimes@freebsd.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808142016.w7EKGPiZ044105>