--- a/usr/src/cmd/installadm/installadm.c	Tue Jan 27 11:34:03 2009 -0700
+++ b/usr/src/cmd/installadm/installadm.c	Wed Jan 28 18:21:01 2009 -0700
@@ -765,6 +765,8 @@
 	char		*service_name;
 	char		txt_record[DATALEN];
 	char		cmd[MAXPATHLEN];
+	char		image_dir[MAXNAMELEN];
+	char		boot_file[MAXNAMELEN];
 
 	if (argc != 2) {
 		(void) fprintf(stderr, "%s\n", gettext(use));
@@ -777,6 +779,16 @@
 		return (INSTALLADM_FAILURE);
 	}
 
+	/*
+	 * make sure the service exists
+	 */
+	if (get_service_data(service_name, image_dir, boot_file,
+				txt_record) != B_TRUE) {
+		(void) fprintf(stderr, MSG_SERVICE_DOESNT_EXIST,
+				service_name);
+		return (INSTALLADM_FAILURE);
+	}
+
 	wsport = get_a_free_tcp_port(START_WEB_SERVER_PORT);
 	if (wsport == 0) {
 		(void) fprintf(stderr, MSG_CANNOT_FIND_PORT);

--- a/usr/src/cmd/installadm/installadm.h	Tue Jan 27 11:34:03 2009 -0700
+++ b/usr/src/cmd/installadm/installadm.h	Wed Jan 28 18:21:01 2009 -0700
@@ -118,6 +118,8 @@
 	"Failed to register Install Service %s.\n")
 #define	MSG_LIST_SERVICE_FAIL	INSTALLADMSTR(\
 	"Failed to list Install Services.\n")
+#define	MSG_SERVICE_DOESNT_EXIST	INSTALLADMSTR(\
+	"The specified service does not exist: %s\n")
 #define	MSG_SERVICE_PROP_FAIL	INSTALLADMSTR(\
 	"Failed to get Install Service properties.\n")
 #define	MSG_CREATE_DHCP_SERVER_ERR	INSTALLADMSTR(\

--- a/usr/src/cmd/installadm/setup-service.sh	Tue Jan 27 11:34:03 2009 -0700
+++ b/usr/src/cmd/installadm/setup-service.sh	Wed Jan 28 18:21:01 2009 -0700
@@ -19,7 +19,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 
 # Description:
@@ -313,9 +313,9 @@
 	# Search the processes to find the webserver that is using $port
 	# and kill the process
 
-	pid=`ps -ef | grep "$AIWEBSERVER_PROGRAM" | grep "$port" |  nawk '{ print $2 }'`
+	webpid=`ps -ef | grep "$AIWEBSERVER_PROGRAM" | grep "$port" |  nawk '{ print $2 }'`
 	if [ $? -ne 0 ]; then
-		kill $pid > /dev/null 2>&1
+		kill $webpid > /dev/null 2>&1
 	fi
 }
 

--- a/usr/src/lib/libtransfer_pymod/libtransfer.c	Tue Jan 27 11:34:03 2009 -0700
+++ b/usr/src/lib/libtransfer_pymod/libtransfer.c	Wed Jan 28 18:21:01 2009 -0700
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -145,7 +145,7 @@
 		    "IPS initialization failed\n");
 		return (status);
 	}
-	ls_write_log_message(TRANSFER_ID, "IPS initilization finished\n");
+	ls_write_log_message(TRANSFER_ID, "IPS initialization finished\n");
 
 	/* do the actual transfer */
 	status = TM_perform_transfer(nvl[1], prog);