diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-01-30 11:05:09 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-01-30 11:05:09 -0800 |
| commit | 7bbe8a9b2dad9b254e3373aa781fa0a79003f819 (patch) | |
| tree | ff62e04dadb34cac2068e6417ca384a9470823e3 | |
| parent | 86ae380eefaa6de3e2f86c9caa032d5b8311062f (diff) | |
| parent | 1e70eece00605b7c81ae536c08eac9a4894c4137 (diff) | |
| download | vyatta-op-7bbe8a9b2dad9b254e3373aa781fa0a79003f819.tar.gz vyatta-op-7bbe8a9b2dad9b254e3373aa781fa0a79003f819.zip | |
Merge branch 'jenner' of 192.168.100.1:git/vyatta-op into jenner
| -rwxr-xr-x | scripts/vyatta-cpu-summary.pl | 10 | ||||
| -rw-r--r-- | templates/show/hardware/cpu/summary/node.def | 2 |
2 files changed, 7 insertions, 5 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"; diff --git a/templates/show/hardware/cpu/summary/node.def b/templates/show/hardware/cpu/summary/node.def index 9918d22..6a6582a 100644 --- a/templates/show/hardware/cpu/summary/node.def +++ b/templates/show/hardware/cpu/summary/node.def @@ -1,2 +1,2 @@ help: Show CPU's on system -run: ${vyatta_datadir}/vyatta-op/bin/vyatta-cpu-summary.pl +run: ${vyatta_bindir}/vyatta-cpu-summary.pl |