diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-01-30 11:03:50 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-01-30 11:03:50 -0800 |
| commit | 1e70eece00605b7c81ae536c08eac9a4894c4137 (patch) | |
| tree | ad8e8e1431a910dadcb59dece754ef4363f1fa89 | |
| parent | b204513bbfbac10a826e485f677c7ed77e342d52 (diff) | |
| download | vyatta-op-1e70eece00605b7c81ae536c08eac9a4894c4137.tar.gz vyatta-op-1e70eece00605b7c81ae536c08eac9a4894c4137.zip | |
Fix CPU summary
Handle case of UP and virtualized CPU better.
Fix path to script.
| -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 |