Print this page
onc plus-be-gone
@@ -16,15 +16,13 @@
* fields enclosed by brackets "[]" replaced with your own identifying
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
*/
-/* ONC_PLUS EXTRACT START */
/*
* Copyright (c) 1982, 2010, Oracle and/or its affiliates. All rights reserved.
*/
-/* ONC_PLUS EXTRACT END */
/*
* Configure root, swap and dump devices.
*/
@@ -324,11 +322,10 @@
if (modloadonly(NULL, name) < 0)
cmn_err(CE_WARN, wmesg, name);
return (0);
}
-/* ONC_PLUS EXTRACT START */
/*
* We want to load all the modules needed to mount the root filesystem,
* so that when we start the ball rolling in 'getrootdev', every module
* should already be in memory, just waiting to be init-ed.
*/
@@ -338,11 +335,10 @@
{
struct vfssw *vsw;
char *this;
char *name;
int err;
-/* ONC_PLUS EXTRACT END */
int i, proplen;
extern char *impl_module_list[];
extern char *platform_module_list[];
/* Make sure that the PROM's devinfo tree has been created */
@@ -481,11 +477,10 @@
* FORCELOAD keyword.
*/
BMDPRINTF(("loadrootmodules: preload_module\n"));
(void) mod_sysctl_type(MOD_FORCELOAD, preload_module, NULL);
-/* ONC_PLUS EXTRACT START */
/*
* If we booted otw then load in the plumbing
* routine now while we still can. If we didn't
* boot otw then we will load strplumb in main().
*
@@ -580,11 +575,10 @@
if (err != 0 && (boothowto & RB_ASKNAME))
goto loop;
return (err);
}
-/* ONC_PLUS EXTRACT END */
static int
get_bootpath_prop(char *bootpath)
{
if (root_is_ramdisk) {