From 541e211b7c964b7c02dead4e8c61d2add10bc94f Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Tue, 8 Aug 2017 10:16:13 +0200 Subject: [PATCH] sysinfo: only dump #r/nvram on amd64,386 right now, theres no kernel that stores hostowner keys in #r/nvram, but this could change in the future. so only dump #r/nvram on the pc where we know that its not used to hold keys. --- rc/bin/sysinfo | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/rc/bin/sysinfo b/rc/bin/sysinfo index 3a4e890ef..0a4f7c343 100755 --- a/rc/bin/sysinfo +++ b/rc/bin/sysinfo @@ -21,6 +21,7 @@ fn print{ logprog pci -v logprog aux/cpuid logprog aux/icanhasmsi + logprog aux/icanhasvmx logprog aux/pcmcia logprog cat '#u/usb/ctl' logprog cat '#S/sdctl' @@ -33,10 +34,13 @@ fn print{ logprog cat $i/ifstats } } - logprog cat '#v/vgactl' - echo '@{rfork n; aux/realemu; aux/vga -p}' - @{rfork n; aux/realemu; aux/vga -p} - logprog xd -x1 '#r/nvram' + if(test -e '#v/vgactl'){ + logprog cat '#v/vgactl' + echo '@{rfork n; aux/realemu; aux/vga -p}' + @{rfork n; aux/realemu; aux/vga -p} + } + if(~ $cputype 386 amd64) + logprog xd -x1 '#r/nvram' logprog cat '#A/audiostat' logprog cat '#A/volume' logprog cat /mnt/apm/ctl