From owner-svn-src-head@freebsd.org Thu Aug 9 02:07:55 2018 Return-Path: Delivered-To: svn-src-head@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 287281075194; Thu, 9 Aug 2018 02:07:55 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CCF417953D; Thu, 9 Aug 2018 02:07:54 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 6A37921848; Thu, 9 Aug 2018 02:07:54 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-lf1-f52.google.com with SMTP id l16-v6so2948560lfc.13; Wed, 08 Aug 2018 19:07:54 -0700 (PDT) X-Gm-Message-State: AOUpUlGdv+cI9/Y1gftRo/VeHhwZor/k0TUOTc4xcdd3yomVr3voNHoP 5THlfm0UfBEJTNLdw3m2UW5BtmkeSarxs0gKSV8= X-Google-Smtp-Source: AA+uWPwLCOi3EkGvA9geJA06RrKBX37+Wtv00mqHp6RPh+dHiIY4PJ8y1U0bXiXjOr4WPRiNT2/Wxf7kQ0dIywJ49aU= X-Received: by 2002:a19:e955:: with SMTP id g82-v6mr107921lfh.44.1533780472954; Wed, 08 Aug 2018 19:07:52 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a2e:5742:0:0:0:0:0 with HTTP; Wed, 8 Aug 2018 19:07:32 -0700 (PDT) In-Reply-To: <201808090206.w7926QCr072789@repo.freebsd.org> References: <201808090206.w7926QCr072789@repo.freebsd.org> From: Kyle Evans Date: Wed, 8 Aug 2018 21:07:32 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r337520 - in head/stand/i386: gptboot isoboot To: "Rodney W. Grimes" Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Aug 2018 02:07:55 -0000 On Wed, Aug 8, 2018 at 9:06 PM, Kyle Evans wrote: > 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: guyyur@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 > Rod, Can you test the version of isoboot that was in stable/11 with this patch applied? It seems highly likely that this was the source of your boot issues. Thanks, Kyle Evans