6874636 RFE: zoneadmd should mount cluster branded zones as native in alternate roots.

1 files changed, 14 insertions, 0 deletions

diff --git a/usr/src/cmd/zoneadm/zoneadm.c b/usr/src/cmd/zoneadm/zoneadm.c
index 4d80695b93..f67ea8f4a4 100644
--- a/usr/src/cmd/zoneadm/zoneadm.c
+++ b/usr/src/cmd/zoneadm/zoneadm.c
@@ -5662,6 +5662,20 @@ main(int argc, char **argv)
 			zerror(gettext("missing or invalid brand"));
 			exit(Z_ERR);
 		}
+		/*
+		 * In the alternate root environment, the only supported
+		 * operations are mount and unmount.  In this case, just treat
+		 * the zone as native if it is cluster.  Cluster zones can be
+		 * native for the purpose of LU or upgrade, and the cluster
+		 * brand may not exist in the miniroot (such as in net install
+		 * upgrade).
+		 */
+		if (strcmp(target_brand, CLUSTER_BRAND_NAME) == 0) {
+			if (zonecfg_in_alt_root()) {
+				(void) strlcpy(target_brand, NATIVE_BRAND_NAME,
+				    sizeof (target_brand));
+			}
+		}
 	}
 
 	err = parse_and_run(argc - optind, &argv[optind]);