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

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/intel/sys/bootconf.h
          +++ new/usr/src/uts/intel/sys/bootconf.h
↓ open down ↓ 15 lines elided ↑ open up ↑
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  
  22   22  /*
  23   23   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  24   24   * Use is subject to license terms.
  25   25   * Copyright 2016 Nexenta Systems, Inc.
  26      - * Copyright 2019, Joyent, Inc.
       26 + * Copyright 2020 Joyent, Inc.
  27   27   */
  28   28  
  29   29  #ifndef _SYS_BOOTCONF_H
  30   30  #define _SYS_BOOTCONF_H
  31   31  
  32   32  
  33   33  /*
  34   34   * Boot time configuration information objects
  35   35   */
  36   36  
↓ open down ↓ 199 lines elided ↑ open up ↑
 236  236  /*PRINTFLIKE2*/
 237  237  extern void bop_printf(void *, const char *, ...)
 238  238      __KPRINTFLIKE(2);
 239  239  extern void vbop_printf(void *, const char *, va_list);
 240  240  
 241  241  /*PRINTFLIKE1*/
 242  242  extern void bop_panic(const char *, ...)
 243  243      __KPRINTFLIKE(1) __NORETURN;
 244  244  #pragma rarely_called(bop_panic)
 245  245  
 246      -extern void boot_prop_finish(void);
      246 +extern void read_bootenvrc(void);
 247  247  
 248  248  extern int bootprop_getval(const char *, u_longlong_t *);
 249  249  extern int bootprop_getstr(const char *, char *, size_t);
 250  250  
 251  251  /*
 252  252   * Back door to fakebop.c to get physical memory allocated.
 253  253   * 64 bit data types are fixed for 32 bit PAE use.
 254  254   */
 255  255  extern paddr_t do_bop_phys_alloc(uint64_t, uint64_t);
 256  256  
↓ open down ↓ 11 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX