Adding AoE support to nza-kernel

@@ -18,10 +18,11 @@
  *
  * CDDL HEADER END
  */
 
 /*
+ * Copyright 2012 Nexenta Systems, Inc.  All rights reserved.
  * Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
 /*      Copyright (c) 1988 AT&T */
 /*        All Rights Reserved   */

@@ -365,10 +366,11 @@
         extern void     fsflush();
         extern int      (*init_tbl[])();
         extern int      (*mp_init_tbl[])();
         extern id_t     syscid, defaultcid;
         extern int      swaploaded;
+        extern char     *aoepath_prop;
         extern int      netboot;
         extern ib_boot_prop_t *iscsiboot_prop;
         extern void     vm_init(void);
         extern void     cbe_init_pre(void);
         extern void     cbe_init(void);

@@ -499,11 +501,11 @@
 
         /*
          * Plumb the protocol modules and drivers only if we are not
          * networked booted, in this case we already did it in rootconf().
          */
-        if (netboot == 0 && iscsiboot_prop == NULL)
+        if (aoepath_prop == NULL && iscsiboot_prop == NULL && !netboot)
                 (void) strplumb();
 
         gethrestime(&PTOU(curproc)->u_start);
         curthread->t_start = PTOU(curproc)->u_start.tv_sec;
         p->p_mstart = gethrtime();