changeset 2971:0405b814ed76

6454140 zoneadm fails to mount fs in mini-root
author gjelinek
date Mon, 23 Oct 2006 10:15:52 -0700
parents f7b39b7a47d4
children 10096047b1c0
files usr/src/cmd/zoneadm/zoneadm.c
diffstat 1 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/zoneadm/zoneadm.c	Mon Oct 23 10:07:25 2006 -0700
+++ b/usr/src/cmd/zoneadm/zoneadm.c	Mon Oct 23 10:15:52 2006 -0700
@@ -2279,6 +2279,14 @@
 {
 	struct stat st;
 
+	/*
+	 * This validation is really intended for standard zone administration.
+	 * If we are in a mini-root or some other upgrade situation where
+	 * we are using the scratch zone, just by-pass this.
+	 */
+	if (zonecfg_in_alt_root())
+		return (Z_OK);
+
 	if (strcmp(fstab->zone_fs_type, MNTTYPE_ZFS) == 0)
 		return (verify_fs_zfs(fstab));