svn commit: r337520 - in head/stand/i386: gptboot isoboot

[Kyle Evans]

On Wed, Aug 8, 2018 at 9:06 PM, Kyle Evans <kevans at freebsd.org> 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 at 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