diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-06-24 13:20:39 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-06-24 13:20:39 +0200 |
| commit | 997291b8a6a66953c6a6270c2dda323769452581 (patch) | |
| tree | da24c0099caede14445289dca8d76560c08de1d9 /templates/show/hardware/cpu | |
| parent | 3610a467094e80a39b6627f6b7655430917b9bd3 (diff) | |
| parent | add153b13de56f97624b2dc433fdbe21b36dbeed (diff) | |
| download | vyatta-op-lithium.tar.gz vyatta-op-lithium.zip | |
Merge branch 'current' into lithiumlithium
Conflicts:
Makefile.am
debian/changelog
templates/restart/dns/forwarding/node.def
templates/show/version/added/node.def
templates/show/version/all/node.def
templates/show/version/deleted/node.def
templates/show/version/downgraded/node.def
templates/show/version/node.def
templates/show/version/upgraded/node.def
Diffstat (limited to 'templates/show/hardware/cpu')
| -rw-r--r-- | templates/show/hardware/cpu/detail/node.def | 4 | ||||
| -rw-r--r-- | templates/show/hardware/cpu/node.def | 2 | ||||
| -rw-r--r-- | templates/show/hardware/cpu/summary/node.def | 2 |
3 files changed, 0 insertions, 8 deletions
diff --git a/templates/show/hardware/cpu/detail/node.def b/templates/show/hardware/cpu/detail/node.def deleted file mode 100644 index 2e3c616..0000000 --- a/templates/show/hardware/cpu/detail/node.def +++ /dev/null @@ -1,4 +0,0 @@ -help: Show system CPU details -run: less $_vyatta_less_options \ - --prompt=".cpu info" \ - -- /proc/cpuinfo diff --git a/templates/show/hardware/cpu/node.def b/templates/show/hardware/cpu/node.def deleted file mode 100644 index 653b558..0000000 --- a/templates/show/hardware/cpu/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Show CPU info -run: lscpu diff --git a/templates/show/hardware/cpu/summary/node.def b/templates/show/hardware/cpu/summary/node.def deleted file mode 100644 index 6a6582a..0000000 --- a/templates/show/hardware/cpu/summary/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Show CPU's on system -run: ${vyatta_bindir}/vyatta-cpu-summary.pl |