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

*** 23,33 **** * Use is subject to license terms. */ /* * Copyright 2011 Bayard G. Bell <buffer.g.overflow@gmail.com>. * All rights reserved. Use is subject to license terms. ! * Copyright (c) 2018, Joyent, Inc. */ /* * Kernel's linker/loader */ --- 23,33 ---- * Use is subject to license terms. */ /* * Copyright 2011 Bayard G. Bell <buffer.g.overflow@gmail.com>. * All rights reserved. Use is subject to license terms. ! * Copyright 2020 Joyent, Inc. */ /* * Kernel's linker/loader */
*** 421,431 **** /* * Now that the ramdisk is mounted, finish boot property * initialization. */ ! boot_prop_finish(); } #if !defined(_UNIX_KRTLD) /* * 'unix' is linked together with 'krtld' into one executable and --- 421,431 ---- /* * Now that the ramdisk is mounted, finish boot property * initialization. */ ! read_bootenvrc(); } #if !defined(_UNIX_KRTLD) /* * 'unix' is linked together with 'krtld' into one executable and