From owner-svn-src-stable-11@freebsd.org Tue Aug 14 20:16:37 2018 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CCF7E105B85A; Tue, 14 Aug 2018 20:16:37 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2A980863A0; Tue, 14 Aug 2018 20:16:36 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id w7EKGQqI044106; Tue, 14 Aug 2018 13:16:27 -0700 (PDT) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id w7EKGPiZ044105; Tue, 14 Aug 2018 13:16:25 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201808142016.w7EKGPiZ044105@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r337816 - in stable/11/stand/i386: gptboot isoboot In-Reply-To: <201808141944.w7EJiaAv090670@repo.freebsd.org> To: Kyle Evans Date: Tue, 14 Aug 2018 13:16:25 -0700 (PDT) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Aug 2018 20:16:38 -0000 [ 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