6143 x86 AI 11/08 install fails if you use SUNWinstalladm-tools from 0109
authorSue Sohn <Susan.Sohn@Sun.COM>
Tue, 20 Jan 2009 15:53:16 -0700
changeset 415 968ac60fbd68
parent 414 ad63b7c430bb
child 416 caa677cf235d
6143 x86 AI 11/08 install fails if you use SUNWinstalladm-tools from 0109
usr/src/cmd/installadm/installadm-common.sh
--- a/usr/src/cmd/installadm/installadm-common.sh	Tue Jan 20 08:52:20 2009 -0700
+++ b/usr/src/cmd/installadm/installadm-common.sh	Tue Jan 20 15:53:16 2009 -0700
@@ -199,8 +199,12 @@
 	printf "${SERVICE_NAME}"  >> ${tmpmenu}
 
 	printf ",livemode=text\n" >> ${tmpmenu}
-	printf "\tmodule /${BootLofs}/boot_archive\n" >> ${tmpmenu}
-
+	if [ -f ${IMAGE_PATH}/boot/x86.microroot ]; then
+		# for backwards compatibility, check for x86.microroot
+		printf "\tmodule /${BootLofs}/x86.microroot\n" >> ${tmpmenu}
+	else
+		printf "\tmodule /${BootLofs}/boot_archive\n" >> ${tmpmenu}
+	fi
         mv ${tmpmenu} ${Menufile}
 
         return 0
@@ -231,8 +235,7 @@
 		mountpt=`echo $line | cut -d ' ' -f3`
 		BootLofs=`basename "${mountpt}"`
 		BootLofsdir=`dirname "${mountpt}"`
-		if [ ${BootLofsdir} != ${Bootdir} ]; then
-			printf "${myname}: ${IMAGE_BOOTDIR} mounted at"
+		if [ ${BootLofsdir} != ${Bootdir} ]; then printf "${myname}: ${IMAGE_BOOTDIR} mounted at"
 			printf " ${mountpt}\n"
 			printf "${myname}: retry after unmounting and deleting"
 			printf " entry form /etc/vfstab\n"