diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-01-29 16:33:35 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-01-29 16:33:35 -0800 |
| commit | c5d9187695e743178bec68353a0b9e97641fdb08 (patch) | |
| tree | b49f8484d534857e97a1e5975b737227cf733608 | |
| parent | 2791133497628c924962fe54724e586b72ea9e58 (diff) | |
| parent | b204513bbfbac10a826e485f677c7ed77e342d52 (diff) | |
| download | vyatta-op-c5d9187695e743178bec68353a0b9e97641fdb08.tar.gz vyatta-op-c5d9187695e743178bec68353a0b9e97641fdb08.zip | |
Merge branch 'jenner' of 192.168.100.1:git/vyatta-op into jenner
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rwxr-xr-x | scripts/vyatta-cpu-summary.pl (renamed from functions/cpu-info) | 0 | ||||
| -rw-r--r-- | templates/show/hardware/cpu/summary/node.def | 2 | ||||
| -rw-r--r-- | templates/show/system/cpu/node.def | 2 |
4 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index d8895d4..3fcf55b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,6 +18,7 @@ bin_SCRIPTS += scripts/vyatta-show-dhclient.pl bin_SCRIPTS += scripts/vyatta-show-dmi bin_SCRIPTS += scripts/vyatta-tshark-interface-port.pl bin_SCRIPTS += scripts/vyatta-show-bonding.pl +bin_SCRIPTS += scripts/vyatta-cpu-summary.pl bin_sudo_users_SCRIPTS = scripts/vyatta-identify-interface.pl bin_sudo_users_SCRIPTS += scripts/vyatta-delete-log-file.sh diff --git a/functions/cpu-info b/scripts/vyatta-cpu-summary.pl index 1839a5d..1839a5d 100755 --- a/functions/cpu-info +++ b/scripts/vyatta-cpu-summary.pl diff --git a/templates/show/hardware/cpu/summary/node.def b/templates/show/hardware/cpu/summary/node.def new file mode 100644 index 0000000..9918d22 --- /dev/null +++ b/templates/show/hardware/cpu/summary/node.def @@ -0,0 +1,2 @@ +help: Show CPU's on system +run: ${vyatta_datadir}/vyatta-op/bin/vyatta-cpu-summary.pl diff --git a/templates/show/system/cpu/node.def b/templates/show/system/cpu/node.def deleted file mode 100644 index e1afaf7..0000000 --- a/templates/show/system/cpu/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Show CPU's on system -run: ${vyatta_datadir}/vyatta-op/functions/cpu-info |