Please review.. Defect: ---------- http://defect.opensolaris.org/bz/show_bug.cgi?id=7986
Webrev: ------------ http://cr.opensolaris.org/~equach/webrev.7986 This fix moves the default.xml file from [1] to [2] [1] SUNWinstalladm-tools -- /var/installadm/ai-webserver/AI_data/default.xml [2] SUNWauto-install-common -- /usr/share/auto_install/default.xml The entire /usr/share/auto_install directory from the AI image will be copied into the top level of the image at build time, so that its readily available for the install service to use. create-service will look for the default.xml file in this directory in the image first before falling back to the one on the running system. add[-manifest] will look for the ai_manifest.rng file in this directory in the image first before falling back to the one on the running system. If/when this directory doesn't exist in the AI image, it will be copied from the solaris.zlib file by create-service (to support older images that wouldn't have had the directory already copied into the top level of the image at build time.) Scenarios tested: -------------------------- New install server w/ new install image - add manifest - manifest gets validated with schema from image. - create-service - default.xml from image is used to set up service. New install server w/ old install image - add manifest - (to an old image service that had already been set up before new tools present) - no change - falls back to using the ai_manifest.rng on the running system. - add manifest - (to an old image service that was created with new tools present) - add manifest uses the ai_manifest.rng from the image. - create-service - default.xml didn't exist in the client image in older builds, so create-service falls back to using the default.xml from the system. The ai_manifest.rng did exist in client images in older builds, so adding manifests in this scenarios does use the ai_manifest.rng from the image. Older install server w/ new install image - add manifest - no change - create-service - no change thanks, -ethan
