--- a/usr/src/lib/liborchestrator/orchestrator_api.h	Tue Jul 07 14:47:27 2009 +0200
+++ b/usr/src/lib/liborchestrator/orchestrator_api.h	Fri Jul 10 08:45:14 2009 -0600
@@ -58,9 +58,6 @@
 	OM_UPGRADE_CHECK,
 	OM_SOFTWARE_UPDATE,
 	OM_POSTINSTAL_TASKS,
-	OM_TOOLS_SUNSTUDIO,
-	OM_TOOLS_NETBEANS,
-	OM_TOOLS_JAVAAPPSVR,
 	OM_INSTALLER_FAILED
 } om_milestone_type_t;
 
@@ -377,15 +374,14 @@
 #define	OM_ERROR_THREAD_CREATE			901
 #define	OM_NO_PROGRESS_FILE			902
 #define	OM_NO_PROCESS				903
-#define	OM_PFINSTALL_FAILURE			904
-#define	OM_INVALID_USER				905
-#define	OM_TOOLS_INSTALL_FAILURE		906
-#define	OM_MISSING_TOOLS_SCRIPT			907
-#define	OM_CANT_CREATE_VTOC_TARGET		908
-#define	OM_CANT_CREATE_ZPOOL			909
-#define	OM_CANT_CREATE_ZVOL			910
-#define	OM_ALREADY_EXISTS			911
-#define	OM_PROTECTED				912
+#define	OM_INVALID_USER				904
+#define	OM_TOOLS_INSTALL_FAILURE		905
+#define	OM_MISSING_TOOLS_SCRIPT			906
+#define	OM_CANT_CREATE_VTOC_TARGET		907
+#define	OM_CANT_CREATE_ZPOOL			908
+#define	OM_CANT_CREATE_ZVOL			909
+#define	OM_ALREADY_EXISTS			910
+#define	OM_PROTECTED				911
 #define	OM_BAD_INPUT				999
 
 /*

--- a/usr/src/lib/liborchestrator/orchestrator_private.h	Tue Jul 07 14:47:27 2009 +0200
+++ b/usr/src/lib/liborchestrator/orchestrator_private.h	Fri Jul 10 08:45:14 2009 -0600
@@ -112,20 +112,8 @@
 #define	X86_ARCH	"i386"
 #define	ALLDISKS	"all"
 
-#define	PART_UNDEFINED		0
-#define	SOLARIS			"solaris"
-#define	DOSPRIMARY		"dosprimary"
 #define	ROOT_FS			"/"
-#define	SECOND_ROOT_FS		"/second_root"
-#define	SWAP_FS			"swap"
-#define	EXPORT_FS		"/export/home"
-#define	FREE_KEYWORD		"free"
-#define	INSTALL_CMD		"/usr/sbin/install.d/pfinstall"
-#define	INSTALL_TEST_CMD	"/usr/bin/dummy_install"
-#define	TOOLS_CMD		"/cdrom/DeveloperTools/main.sh"
-#define	TOOLS_TEST_CMD		"/usr/bin/dummy_tools_install"
 #define	INSTALLED_ROOT_DIR	"/a"
-#define	PROFILE_NAME		"profile"
 #define	HOMEDIR_CREATE_FAILED	"mkdir of %s returned error %d\n"
 #define	BAD_DISK_SLICE		"Bad disk slice %s\n"
 #define	NSI_CHDIR_FAILED	"chdir to %s failed with error %d\n"
@@ -160,15 +148,6 @@
 #define	ZFS_SHARED_FS_NUM	3
 
 /*
- * Signature for the Install callbacks
- */
-#define	PROGRESS_STATUS			"<progressStatus"
-#define	TARGET_INSTANTIATION_STATUS	"<targetInstantiationStatus"
-#define	POST_INSTALL_STATUS		"<postInstallStatus"
-#define	UPGRADE_SPACE_CHECK		"<UpgradeSpaceCheck"
-#define	INSTALLER_FAILED		"<installerFailure"
-
-/*
  * file containing image information
  */
 #define	IMAGE_INFO_FILE_NAME		"/.cdrom/.image_info"
@@ -360,7 +339,6 @@
 int set_password_common(char *user, char *login, char *e_passwd);
 int set_hostname_nodename(char *hostname);
 int16_t get_the_percentage(char *str);
-int get_the_milestone(char *str);
 om_install_type_t get_user_install_type(char *file);
 uint64_t calc_required_swap_size(void);
 

--- a/usr/src/lib/liborchestrator/perform_slim_install.c	Tue Jul 07 14:47:27 2009 +0200
+++ b/usr/src/lib/liborchestrator/perform_slim_install.c	Fri Jul 10 08:45:14 2009 -0600
@@ -417,9 +417,7 @@
 
 	/*
 	 * The .sysIDtool.state file needs to be written before the
-	 * install completes. The transfer list is processed
-	 * before we return from pfinstall, so update the state
-	 * here for install.
+	 * install completes. Update the state here for install.
 	 */
 	set_system_state();
 	/*
@@ -1678,37 +1676,6 @@
 	return (percent);
 }
 
-/*
- * Parsing function to get the current milestone
- * and converts it to integer.
- * The string looks like "<progressStatus"
- */
-int
-get_the_milestone(char *str)
-{
-	if (strncasecmp(str, PROGRESS_STATUS,
-	    strlen(PROGRESS_STATUS)) == 0) {
-		return (OM_SOFTWARE_UPDATE);
-	}
-	if (strncasecmp(str, TARGET_INSTANTIATION_STATUS,
-	    strlen(TARGET_INSTANTIATION_STATUS)) == 0) {
-		return (OM_TARGET_INSTANTIATION);
-	}
-	if (strncasecmp(str, POST_INSTALL_STATUS,
-	    strlen(POST_INSTALL_STATUS)) == 0) {
-		return (OM_POSTINSTAL_TASKS);
-	}
-	if (strncasecmp(str, UPGRADE_SPACE_CHECK,
-	    strlen(UPGRADE_SPACE_CHECK)) == 0) {
-		return (OM_UPGRADE_CHECK);
-	}
-	if (strncasecmp(str, INSTALLER_FAILED,
-	    strlen(INSTALLER_FAILED)) == 0) {
-		return (OM_INSTALLER_FAILED);
-	}
-	return (OM_INVALID_MILESTONE);
-}
-
 /*ARGSUSED*/
 uint64_t
 om_get_min_size(char *media, char *distro)