Mercurial > illumos > illumos-gate

changeset 12936:bef00af5d4ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6968795 stmsboot -d fails with "Method "/lib/svc/method/fs-usr" failed with exit status 95" error
author jianfei wang - Sun Microsystems - Beijing China <Jianfei.Wang@Sun.COM>
date Wed, 28 Jul 2010 08:00:21 +0800
parents eb113dc3db0b
children 12cf927830ab
files usr/src/cmd/stmsboot/stmsboot_util.c
diffstat 1 files changed, 38 insertions(+), 39 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/stmsboot/stmsboot_util.c	Tue Jul 27 16:48:51 2010 -0700
+++ b/usr/src/cmd/stmsboot/stmsboot_util.c	Wed Jul 28 08:00:21 2010 +0800
@@ -872,8 +872,9 @@
 		if (devfspath == NULL)
 			continue;
 
-		if (strncmp(strdevfspath, devfspath,
-		    strlen(strdevfspath)) == 0) {
+		if ((strlen(strdevfspath) == strlen(devfspath)) &&
+		    (strncmp(strdevfspath, devfspath,
+		    strlen(devfspath)) == 0)) {
 			node_name = find_link(curnode);
 			if (node_name == NULL) {
 				(void) printf("NOT MAPPED\n");
@@ -1366,46 +1367,44 @@
 
 	pi = (sv_path_info_t *)ioc.ret_buf;
 	while (npaths--) {
-		if (pi->ret_state == MDI_PATHINFO_STATE_ONLINE) {
-
-			bzero(nodename, MAXPATHLEN);
-			bzero(phci_driver, 10);
+		bzero(nodename, MAXPATHLEN);
+		bzero(phci_driver, 10);
 
-			get_phci_driver_name(pi->device.ret_phci,
-			    &phci_driver);
-			logmsg(MSG_INFO, "phci driver name: %s\n", phci_driver);
-			/*
-			 * A hack, but nicer than a platform-specific ifdef
-			 * fp on SPARC using "ssd" as nodename
-			 * mpt use "sd" when mpxio disabled, use "disk" when
-			 * mpxio is enabled
-			 * for alll other cases, "disk" should be used as the
-			 * nodename
-			 */
-			if (strstr(devpath, "ssd") != NULL) {
-				(void) snprintf(nodename, 5, "ssd");
-			} else if (strncmp(phci_driver, "mpt", 10) == 0) {
-				(void) snprintf(nodename, 5, "sd");
+		get_phci_driver_name(pi->device.ret_phci,
+		    &phci_driver);
+		logmsg(MSG_INFO, "phci driver name: %s\n", phci_driver);
+		/*
+		 * A hack, but nicer than a platform-specific ifdef
+		 * fp on SPARC using "ssd" as nodename
+		 * mpt use "sd" when mpxio disabled, use "disk" when
+		 * mpxio is enabled
+		 * for alll other cases, "disk" should be used as the
+		 * nodename
+		 */
+		if (strstr(devpath, "ssd") != NULL) {
+			(void) snprintf(nodename, 5, "ssd");
+		} else if (strncmp(phci_driver, "mpt", 10) == 0) {
+			(void) snprintf(nodename, 5, "sd");
+		} else {
+			(void) snprintf(nodename, 5, "disk");
+		}
+		if ((d_flag == DISPLAY_ONE_PATH) &&
+		    (pi->ret_state == MDI_PATHINFO_STATE_ONLINE)) {
+			(void) printf("%s/%s@%s", pi->device.ret_phci,
+			    nodename, pi->ret_addr);
+			if ((slice != NULL) && (strlen(slice) <= 3)) {
+				(void) printf("%s\n", slice);
 			} else {
-				(void) snprintf(nodename, 5, "disk");
+				(void) printf("\n");
 			}
-			if (d_flag == DISPLAY_ONE_PATH) {
-				(void) printf("%s/%s@%s", pi->device.ret_phci,
-				    nodename, pi->ret_addr);
-				if ((slice != NULL) && (strlen(slice) <= 3)) {
-					(void) printf("%s\n", slice);
-				} else {
-					(void) printf("\n");
-				}
-				break;
-			} else if (d_flag == DISPLAY_ALL_PATH) {
-				(void) printf("%s/%s@%s", pi->device.ret_phci,
-				    nodename, pi->ret_addr);
-				if ((slice != NULL) && (strlen(slice) <= 3)) {
-					(void) printf("%s\n", slice);
-				} else {
-					(void) printf("\n");
-				}
+			break;
+		} else if (d_flag == DISPLAY_ALL_PATH) {
+			(void) printf("%s/%s@%s", pi->device.ret_phci,
+			    nodename, pi->ret_addr);
+			if ((slice != NULL) && (strlen(slice) <= 3)) {
+				(void) printf("%s\n", slice);
+			} else {
+				(void) printf("\n");
 			}
 		}
 		pi++;