summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2018-11-20 15:28:57 -0800
committerJoshua M. Clulow <josh@sysmgr.org>2018-11-20 15:28:58 -0800
commit8e9dfb97a84bbf797669c3ee2aabcc48b9ee13ff (patch)
tree4f6c6012fe49374ec95efae409a66e86c9e5ac21 /usr/src
parentdbad7380d7852483de489e640f3a64b386115d59 (diff)
downloadillumos-gate-8e9dfb97a84bbf797669c3ee2aabcc48b9ee13ff.tar.gz
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>
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/cmd/mdb/intel/kmdb/kctl/kctl_isadep.c8
1 files changed, 3 insertions, 5 deletions
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 41cdf82094..be78d7fa48 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 @@ kctl_pcache_create(int *nprops)
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' &&