Print this page
12220 loader multi-console shouldn't override bootenv.rc

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/krtld/kobj.c
          +++ new/usr/src/uts/common/krtld/kobj.c
↓ open down ↓ 17 lines elided ↑ open up ↑
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  23   23   * Use is subject to license terms.
  24   24   */
  25   25  /*
  26   26   * Copyright 2011 Bayard G. Bell <buffer.g.overflow@gmail.com>.
  27   27   * All rights reserved. Use is subject to license terms.
  28      - * Copyright (c) 2018, Joyent, Inc.
       28 + * Copyright 2020 Joyent, Inc.
  29   29   */
  30   30  
  31   31  /*
  32   32   * Kernel's linker/loader
  33   33   */
  34   34  
  35   35  #include <sys/types.h>
  36   36  #include <sys/param.h>
  37   37  #include <sys/sysmacros.h>
  38   38  #include <sys/systm.h>
↓ open down ↓ 377 lines elided ↑ open up ↑
 416  416          }
 417  417  #else
 418  418          {
 419  419                  /* on x86, we always boot with a ramdisk */
 420  420                  (void) kobj_boot_mountroot();
 421  421  
 422  422                  /*
 423  423                   * Now that the ramdisk is mounted, finish boot property
 424  424                   * initialization.
 425  425                   */
 426      -                boot_prop_finish();
      426 +                read_bootenvrc();
 427  427          }
 428  428  
 429  429  #if !defined(_UNIX_KRTLD)
 430  430          /*
 431  431           * 'unix' is linked together with 'krtld' into one executable and
 432  432           * the early boot code does -not- hand us any of the dynamic metadata
 433  433           * about the executable. In particular, it does not read in, map or
 434  434           * otherwise look at the program headers. We fake all that up now.
 435  435           *
 436  436           * We do this early as DTrace static probes and tnf probes both call
↓ open down ↓ 4234 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX