summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2009-01-30 11:05:09 -0800
committerStephen Hemminger <stephen.hemminger@vyatta.com>2009-01-30 11:05:09 -0800
commit7bbe8a9b2dad9b254e3373aa781fa0a79003f819 (patch)
treeff62e04dadb34cac2068e6417ca384a9470823e3 /scripts
parent86ae380eefaa6de3e2f86c9caa032d5b8311062f (diff)
parent1e70eece00605b7c81ae536c08eac9a4894c4137 (diff)
downloadvyatta-op-7bbe8a9b2dad9b254e3373aa781fa0a79003f819.tar.gz
vyatta-op-7bbe8a9b2dad9b254e3373aa781fa0a79003f819.zip
Merge branch 'jenner' of 192.168.100.1:git/vyatta-op into jenner
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/vyatta-cpu-summary.pl10
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/vyatta-cpu-summary.pl b/scripts/vyatta-cpu-summary.pl
index 1839a5d..771bc5a 100755
--- a/scripts/vyatta-cpu-summary.pl
+++ b/scripts/vyatta-cpu-summary.pl
@@ -31,7 +31,9 @@ while (<$cpuinfo>) {
}
close $cpuinfo;
-print "CPU ", join( " \n", keys %models ), "\n";
-print "Packages ", scalar keys %packages, "\n";
-print "Cores ", scalar keys %cores, "\n";
-print "Threads ", $cpu, "\n";
+print "Processors ", $cpu, "\n";
+print "Packages ", scalar keys %packages, "\n" if (%packages);
+print "Cores ", scalar keys %cores, "\n" if (%cores);
+
+# Handle any attempt to run different CPU models
+print "Model ", join( " \n", keys %models ), "\n";