upstream/oracle/slim_source: comparison usr/src/cmd/auto-install/auto

equal deleted inserted replaced

-:ccd399d2c6f7
+:e9f31f2f2f2d
 	}
 	(void) pclose(file_ptr);
 }
 /*
-* This function splits the file that is passed to AI manifest and SC manifest
+* This function splits the passed in file into AI manifest and SC manifest
 *
 * Input:
-* char *input_file	- The file contains AI manifest (relax NG schema) and
+* char *input_file	- AI manifest file with embedded SC manifest
-*			  SC manifest (enhanced SMF profile DTD schema)
+*
 * Output:
-* char *ai_manifest	- Writes the AI manifest portion of the input on this
+* char *ai_manifest	- Writes the AI manifest portion of the input to this
 *			  file name
-* char *sc_manifest	- Writes the SC manifest portion of the input on this
+* char *sc_manifest	- Writes the SC manifest portion of the input to this
 *			  file name
 * Returns:
 * AUTO_VALID_MANIFEST (0)	- If the operation is successful
 * AUTO_INVALID_MANIFEST (-1)	- If the operation fails
 */
 auto_split_manifests(char *input_file, char *ai_manifest, char *sc_manifest)
 {
 	FILE		*ifp;	/* Input file */
 	FILE		*aifp;	/* AI manifest */
 	FILE		*scfp;	/* SC manifest */
-	boolean_t	writing_ai_manifest = B_FALSE;
+	boolean_t	writing_ai_manifest = B_TRUE;
 	boolean_t	writing_sc_manifest = B_FALSE;
 	char		buf[BUFSIZ];
 	if (input_file == NULL || ai_manifest == NULL || sc_manifest == NULL) {
 	}
 	while (fgets(buf, sizeof (buf), ifp) != NULL) {
 		/*
-		 * The AI manifest begins with <ai_manifest and
-		 * ends with the line "</ai_manifest>"
 		 * The SC manifest begins with <?xml version='1.0'?> and
-		 * ends with the line "</service_bundle>"
+		 * ends with the line "</service_bundle>". It is embedded
-		 *
+		 * in the input file between <sc_embedded_manifest ...>
+		 * and  </sc_embedded_manifest>.
 		 */
-		if (strstr(buf, AI_MANIFEST_BEGIN_MARKER) != NULL) {
+		if (strstr(buf, SC_EMBEDDED_BEGIN_MARKER) != NULL) {
+			writing_ai_manifest = B_FALSE;
+			continue;
+		}
+		if (strstr(buf, SC_EMBEDDED_END_MARKER) != NULL) {
 			writing_ai_manifest = B_TRUE;
-		}
+			continue;
-		if (strstr(buf, SC_MANIFEST_BEGIN_MARKER) != NULL) {
+		}
+		if ((strstr(buf, SC_MANIFEST_BEGIN_MARKER) != NULL) &&
+		    (! writing_ai_manifest)) {
 			writing_sc_manifest = B_TRUE;
 			/*
 			 * XML is pretty strict about format of XML prolog.
 			 * It is optional, but if present, no leading comments
 			fputs(SC_MANIFEST_BEGIN_MARKER, scfp);
 			fputs("\n", scfp);
 			continue;
 		}
 		if (writing_ai_manifest) {
-			if (strstr(buf, AI_MANIFEST_END_MARKER) != NULL) {
-				writing_ai_manifest = B_FALSE;
-			}
 			fputs(buf, aifp);
 			continue;
 		} else if (writing_sc_manifest) {
 			if (strstr(buf, SC_MANIFEST_END_MARKER) != NULL) {
 				writing_sc_manifest = B_FALSE;
 	if (pkg_list_type == AI_PACKAGE_LIST_INSTALL) {
 		package_list = ai_get_manifest_packages(&num_packages,
 		    AIM_PACKAGE_INSTALL_NAME);
 		if (package_list == NULL) {
-			auto_debug_print(AUTO_DBGLVL_INFO,
+			/* If no package list given, use default */
-			    "Tag %s not available, %s will be tried\n",
-			    AIM_PACKAGE_INSTALL_NAME,
-			    AIM_OLD_PACKAGE_INSTALL_NAME);
-			package_list = ai_get_manifest_packages(&num_packages,
-			    AIM_OLD_PACKAGE_INSTALL_NAME);
-		}
-		if (package_list == NULL) {
 			auto_debug_print(AUTO_DBGLVL_ERR,
-			    "Couldn't obtain list of packages to be "
+			    "No install package list given, using default\n");
-			    "installed\n");
+			num_packages = 4;
-			(void) fclose(fp);
+			package_list = malloc((num_packages + 1) * sizeof (char *));
-			return (AUTO_INSTALL_FAILURE);
+			package_list[0] = strdup("pkg:/SUNWcsd");
+			package_list[1] = strdup("pkg:/SUNWcs");
+			package_list[2] = strdup("pkg:/babel_install");
+			package_list[3] = strdup("pkg:/entire");
+			package_list[4] = NULL;
 		}
 		auto_log_print(gettext(
 		    "list of packages to be installed is:\n"));
 	} else {
 	return (0);
 }
 /*
 * Install the target based on the criteria specified in
-* the ai_manifest.xml.
+* ai.xml.
 *
 * NOTE: ai_validate_manifest() MUST have been called prior
 * to calling this function.
 *
 * RETURNS:
 }
 /*
 * Install the target based on the specified diskname
 * or if no diskname is specified, install it based on
-* the criteria specified in the ai_manifest.xml.
+* the criteria specified in ai.xml.
 *
 * Returns
 *	AUTO_INSTALL_SUCCESS on a successful install
 *	AUTO_INSTALL_FAILURE on a failed install
 */
 	if (profile[0] != '\0') {
 		char	*ai_auto_reboot;
 		/*
-		 * We are passed in a combined AI and SC manifest.
+		 * We are passed in an AI manifest with an embedded
-		 * Before we doing anything meaningful, they must
+		 * SC manifest, both in DTD format. We want to
-		 * be separated since they're in two different
+		 * separate them.
-		 * formats
-		 *
-		 * The AI manifest is in RelaxNG format whereas the
-		 * SC manifest is in a DTD format.
 		 */
 		if (auto_split_manifests(profile, AI_MANIFEST_FILE,
 		    SC_MANIFEST_FILE) != AUTO_VALID_MANIFEST) {
 			auto_log_print(gettext("Auto install failed. Invalid "
 			    "manifest file %s specified\n"), profile);
 			auto_log_print(gettext("Auto install failed. Error "
 			    "creating manifest %s\n"), profile);
 			exit(AI_EXIT_FAILURE_AIM);
 		}
+		if (ai_setup_manifest_image() == AUTO_VALID_MANIFEST) {
+			auto_log_print(gettext(
+			    "%s manifest setup and validated\n"), profile);
+		} else {
+			char *setup_err = gettext("Auto install failed. Error "
+			    "setting up and validating manifest %s\n");
+			auto_log_print(setup_err, profile);
+			(void) fprintf(stderr, setup_err, profile);
+			exit(AI_EXIT_FAILURE_AIM);
+		}
 		/*
 		 * Install any drivers required for installation, in the
-		 * booted environment.  This must be done before semantic
+		 * booted environment.
-		 * validation, since this may add required devices which
-		 * are needed to pass validation.
 		 */
 		/*
 		 * First boolean: do not honor noinstall flag.
 		 * Second boolean: do not update the boot archive.
 			    "  These drivers may or may not be required for "
 			    "the installation to proceed.\n"
 			    "  Will continue anyway...\n");
 			auto_log_print(du_warning);
 			(void) fprintf(stderr, du_warning);
-		}
-		if (ai_setup_manifest_image() == AUTO_VALID_MANIFEST) {
-			auto_log_print(gettext(
-			    "%s manifest setup and validated\n"), profile);
-		} else {
-			char *setup_err = gettext("Auto install failed. Error "
-			    "setting up and validating manifest %s\n");
-			auto_log_print(setup_err, profile);
-			(void) fprintf(stderr, setup_err, profile);
-			exit(AI_EXIT_FAILURE_AIM);
 		}
 		diskname[0] = '\0';
 		/*

changeset 862	e9f31f2f2f2d
parent 846	70dd9e819f25
child 867	cfbbedf29419