upstream/oracle/onnv-gate: comparison usr/src/cmd/zonecfg/zonecfg.c

equal deleted inserted replaced

-:2e5ce9dbe1f9
+:9f2cda0ed938
 	"scheduling-class",
 	"ip-type",
 	"capped-cpu",
 	"hostid",
 	"admin",
+	"fs-allowed",
 	NULL
 };
 /* These *must* match the order of the PT_ define's from zonecfg.h */
 char *prop_types[] = {
 	"ip-type",
 	"defrouter",
 	"hostid",
 	"user",
 	"auths",
+	"fs-allowed",
 	NULL
 };
 /* These *must* match the order of the PROP_VAL_ define's from zonecfg.h */
 static char *prop_val_types[] = {
 	"set " ALIAS_MAXSHMIDS "=",
 	"set " ALIAS_MAXMSGIDS "=",
 	"set " ALIAS_MAXSEMIDS "=",
 	"set " ALIAS_SHARES "=",
 	"set hostid=",
+	"set fs-allowed=",
 	NULL
 };
 static const char *info_cmds[] = {
 	"info fs ",
 	"info max-msg-ids",
 	"info max-sem-ids",
 	"info cpu-shares",
 	"info hostid",
 	"info admin",
+	"info fs-allowed",
 	NULL
 };
 static const char *fs_res_scope_cmds[] = {
 	"add options ",
 		(void) fprintf(fp, "\t%s\t%s\n", gettext("(global)"),
 		    pt_to_str(PT_IPTYPE));
 		(void) fprintf(fp, "\t%s\t%s\n", gettext("(global)"),
 		    pt_to_str(PT_HOSTID));
 		(void) fprintf(fp, "\t%s\t%s\n", gettext("(global)"),
+		    pt_to_str(PT_FS_ALLOWED));
+		(void) fprintf(fp, "\t%s\t%s\n", gettext("(global)"),
 		    pt_to_str(PT_MAXLWPS));
 		(void) fprintf(fp, "\t%s\t%s\n", gettext("(global)"),
 		    pt_to_str(PT_MAXSHMMEM));
 		(void) fprintf(fp, "\t%s\t%s\n", gettext("(global)"),
 		    pt_to_str(PT_MAXSHMIDS));
 	char zonepath[MAXPATHLEN], outfile[MAXPATHLEN], pool[MAXNAMELEN];
 	char bootargs[BOOTARGS_MAX];
 	char sched[MAXNAMELEN];
 	char brand[MAXNAMELEN];
 	char hostidp[HW_HOSTID_LEN];
+	char fsallowedp[ZONE_FS_ALLOWED_MAX];
 	char *limitpriv;
 	FILE *of;
 	boolean_t autoboot;
 	zone_iptype_t iptype;
 	boolean_t need_to_close = B_FALSE;
 	}
 	if (zonecfg_get_hostid(handle, hostidp, sizeof (hostidp)) == Z_OK) {
 		(void) fprintf(of, "%s %s=%s\n", cmd_to_str(CMD_SET),
 		    pt_to_str(PT_HOSTID), hostidp);
+	}
+	if (zonecfg_get_fs_allowed(handle, fsallowedp,
+	    sizeof (fsallowedp)) == Z_OK) {
+		(void) fprintf(of, "%s %s=%s\n", cmd_to_str(CMD_SET),
+		    pt_to_str(PT_FS_ALLOWED), fsallowedp);
 	}
 	if ((err = zonecfg_setipdent(handle)) != Z_OK) {
 		zone_perror(zone, err, B_FALSE);
 		goto done;
 gz_invalid_rt_property(int type)
 {
 	return (global_zone && (type == RT_ZONENAME || type == RT_ZONEPATH ||
 	    type == RT_AUTOBOOT || type == RT_LIMITPRIV ||
 	    type == RT_BOOTARGS || type == RT_BRAND || type == RT_SCHED ||
-	    type == RT_IPTYPE || type == RT_HOSTID));
+	    type == RT_IPTYPE || type == RT_HOSTID || type == RT_FS_ALLOWED));
 }
 static boolean_t
 gz_invalid_property(int type)
 {
 	return (global_zone && (type == PT_ZONENAME || type == PT_ZONEPATH ||
 	    type == PT_AUTOBOOT || type == PT_LIMITPRIV ||
 	    type == PT_BOOTARGS || type == PT_BRAND || type == PT_SCHED ||
-	    type == PT_IPTYPE || type == PT_HOSTID));
+	    type == PT_IPTYPE || type == PT_HOSTID || type == PT_FS_ALLOWED));
 }
 void
 add_func(cmd_t *cmd)
 {
 		remove_aliased_rctl(PT_SHARES, ALIAS_SHARES);
 		return;
 	case PT_HOSTID:
 		if ((err = zonecfg_set_hostid(handle, NULL)) != Z_OK)
 			z_cmd_rt_perror(CMD_CLEAR, RT_HOSTID, err, B_TRUE);
+		else
+			need_to_commit = B_TRUE;
+		return;
+	case PT_FS_ALLOWED:
+		if ((err = zonecfg_set_fs_allowed(handle, NULL)) != Z_OK)
+			z_cmd_rt_perror(CMD_CLEAR, RT_FS_ALLOWED, err, B_TRUE);
 		else
 			need_to_commit = B_TRUE;
 		return;
 	default:
 		zone_perror(pt_to_str(type), Z_NO_PROPERTY_TYPE, B_TRUE);
 			res_type = RT_MAXSEMIDS;
 		} else if (prop_type == PT_SHARES) {
 			res_type = RT_SHARES;
 		} else if (prop_type == PT_HOSTID) {
 			res_type = RT_HOSTID;
+		} else if (prop_type == PT_FS_ALLOWED) {
+			res_type = RT_FS_ALLOWED;
 		} else {
 			zerr(gettext("Cannot set a resource-specific property "
 			    "from the global scope."));
 			saw_error = B_TRUE;
 			return;
 				zone_perror(pt_to_str(prop_type), err, B_TRUE);
 			}
 			return;
 		}
 		need_to_commit = B_TRUE;
+		return;
+	case RT_FS_ALLOWED:
+		if ((err = zonecfg_set_fs_allowed(handle, prop_id)) != Z_OK)
+			zone_perror(zone, err, B_TRUE);
+		else
+			need_to_commit = B_TRUE;
 		return;
 	case RT_FS:
 		switch (prop_type) {
 		case PT_DIR:
 			(void) strlcpy(in_progress_fstab.zone_fs_dir, prop_id,
 static void
 info_hostid(zone_dochandle_t handle, FILE *fp)
 {
 	char hostidp[HW_HOSTID_LEN];
+	int err;
-	/*
-	 * This will display "hostid: " if there isn't a hostid or an
+	if ((err = zonecfg_get_hostid(handle, hostidp,
-	 * error occurs while retrieving the hostid from the configuration
+	    sizeof (hostidp))) == Z_OK) {
-	 * file.
+		(void) fprintf(fp, "%s: %s\n", pt_to_str(PT_HOSTID), hostidp);
-	 */
+	} else if (err == Z_BAD_PROPERTY) {
-	if (zonecfg_get_hostid(handle, hostidp, sizeof (hostidp)) != Z_OK)
+		(void) fprintf(fp, "%s: \n", pt_to_str(PT_HOSTID));
-		hostidp[0] = '\0';
+	} else {
-	(void) fprintf(fp, "%s: %s\n", pt_to_str(PT_HOSTID), hostidp);
+		zone_perror(zone, err, B_TRUE);
+	}
+}
+static void
+info_fs_allowed(zone_dochandle_t handle, FILE *fp)
+{
+	char fsallowedp[ZONE_FS_ALLOWED_MAX];
+	int err;
+	if ((err = zonecfg_get_fs_allowed(handle, fsallowedp,
+	    sizeof (fsallowedp))) == Z_OK) {
+		(void) fprintf(fp, "%s: %s\n", pt_to_str(PT_FS_ALLOWED),
+		    fsallowedp);
+	} else if (err == Z_BAD_PROPERTY) {
+		(void) fprintf(fp, "%s: \n", pt_to_str(PT_FS_ALLOWED));
+	} else {
+		zone_perror(zone, err, B_TRUE);
+	}
 }
 static void
 output_fs(FILE *fp, struct zone_fstab *fstab)
 {
 		if (!global_zone) {
 			info_limitpriv(handle, fp);
 			info_sched(handle, fp);
 			info_iptype(handle, fp);
 			info_hostid(handle, fp);
+			info_fs_allowed(handle, fp);
 		}
 		info_aliased_rctl(handle, fp, ALIAS_MAXLWPS);
 		info_aliased_rctl(handle, fp, ALIAS_MAXSHMMEM);
 		info_aliased_rctl(handle, fp, ALIAS_MAXSHMIDS);
 		info_aliased_rctl(handle, fp, ALIAS_MAXMSGIDS);
 		info_hostid(handle, fp);
 		break;
 	case RT_ADMIN:
 		info_auth(handle, fp, cmd);
 		break;
+	case RT_FS_ALLOWED:
+		info_fs_allowed(handle, fp);
+		break;
 	default:
 		zone_perror(rt_to_str(cmd->cmd_res_type), Z_NO_RESOURCE_TYPE,
 		    B_TRUE);
 	}
 	struct zone_admintab admintab;
 	char zonepath[MAXPATHLEN];
 	char sched[MAXNAMELEN];
 	char brand[MAXNAMELEN];
 	char hostidp[HW_HOSTID_LEN];
+	char fsallowedp[ZONE_FS_ALLOWED_MAX];
 	int err, ret_val = Z_OK, arg;
 	int pset_res;
 	boolean_t save = B_FALSE;
 	boolean_t arg_err = B_FALSE;
 	zone_iptype_t iptype;
 	while (zonecfg_getipdent(handle, &fstab) == Z_OK) {
 		check_reqd_prop(fstab.zone_fs_dir, RT_IPD, PT_DIR, &ret_val);
 	}
 	(void) zonecfg_endipdent(handle);
-	if (zonecfg_get_hostid(handle, hostidp, sizeof (hostidp)) == Z_OK &&
+	if (zonecfg_get_hostid(handle, hostidp,
-	    (err = zonecfg_valid_hostid(hostidp)) != Z_OK) {
+	    sizeof (hostidp)) == Z_INVALID_PROPERTY) {
-		zone_perror(zone, err, B_TRUE);
+		zerr(gettext("%s: invalid hostid: %s"),
+		    zone, hostidp);
+		return;
+	}
+	if (zonecfg_get_fs_allowed(handle, fsallowedp,
+	    sizeof (fsallowedp)) == Z_INVALID_PROPERTY) {
+		zerr(gettext("%s: invalid fs-allowed: %s"),
+		    zone, fsallowedp);
 		return;
 	}
 	if ((err = zonecfg_setfsent(handle)) != Z_OK) {
 		zone_perror(zone, err, B_TRUE);

changeset 12633	9f2cda0ed938
parent 12626	eba16697f6c1
child 12715	cdbca398ec82