9930 uts: kmdb should use "diag-device" when set (missed kmdb "input-device" fix)
Reviewed by: John Levon <john.levon@joyent.com>
Approved by: Joshua M. Clulow <josh@sysmgr.org>
diff --git a/usr/src/cmd/mdb/intel/kmdb/kctl/kctl_isadep.c b/usr/src/cmd/mdb/intel/kmdb/kctl/kctl_isadep.c
index 41cdf82..be78d7f 100644
--- a/usr/src/cmd/mdb/intel/kmdb/kctl/kctl_isadep.c
+++ b/usr/src/cmd/mdb/intel/kmdb/kctl/kctl_isadep.c
@@ -114,14 +114,12 @@
ttymode);
}
- /*
- * console is defined by "console" property, with
- * fallback on the old "input-device" property.
- */
(void) strcpy(inputdev, "text"); /* default to screen */
- if (!preader("console", inputdev, sizeof ((&pnv[0])->kanv_val)))
+ if (!preader("diag-device", inputdev, sizeof ((&pnv[0])->kanv_val)) &&
+ !preader("console", inputdev, sizeof ((&pnv[0])->kanv_val))) {
(void) preader("input-device", inputdev,
sizeof ((&pnv[0])->kanv_val));
+ }
if (strncmp(inputdev, "tty", 3) == 0 &&
inputdev[4] == '\0' &&