From 7c4f84496228c1ef73b4926d426588de8318125b Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Thu, 29 Jan 2009 15:10:07 -0800
Subject: Move 'show system cpu' to 'show hardware cpu summary'

Better more logical location.
---
 templates/show/system/cpu/node.def | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 templates/show/system/cpu/node.def

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 
-- 
cgit v1.2.3


From b204513bbfbac10a826e485f677c7ed77e342d52 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Thu, 29 Jan 2009 16:29:14 -0800
Subject: Change name of cpu summary script and rearrange

Final answer.
---
 Makefile.am                                  |  1 +
 functions/cpu-info                           | 37 ----------------------------
 scripts/vyatta-cpu-summary.pl                | 37 ++++++++++++++++++++++++++++
 templates/show/hardware/cpu/summary/node.def |  2 ++
 4 files changed, 40 insertions(+), 37 deletions(-)
 delete mode 100755 functions/cpu-info
 create mode 100755 scripts/vyatta-cpu-summary.pl
 create mode 100644 templates/show/hardware/cpu/summary/node.def

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/functions/cpu-info
deleted file mode 100755
index 1839a5d..0000000
--- a/functions/cpu-info
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /usr/bin/perl
-# implement "show cpu-info"
-
-open my $cpuinfo, '<', '/proc/cpuinfo'
-  or die "Can't open /proc/cpuinfo : $!";
-
-my %models;
-my %packages;
-my %cores;
-
-my %map = (
-    'model name'  => \%models,
-    'physical id' => \%packages,
-    'core id'     => \%cores
-);
-
-my $cpu = 0;
-while (<$cpuinfo>) {
-    chomp;
-    my ( $tag, $val ) = split /:/;
-    if ( !$tag ) {
-        ++$cpu;
-        next;
-    }
-
-    $tag =~ s/\s+$//;
-    $val =~ s/^\s+//;
-
-    my $ref = $map{$tag};
-    $ref->{$val} = $cpu  if ($ref);
-}
-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";
diff --git a/scripts/vyatta-cpu-summary.pl b/scripts/vyatta-cpu-summary.pl
new file mode 100755
index 0000000..1839a5d
--- /dev/null
+++ b/scripts/vyatta-cpu-summary.pl
@@ -0,0 +1,37 @@
+#! /usr/bin/perl
+# implement "show cpu-info"
+
+open my $cpuinfo, '<', '/proc/cpuinfo'
+  or die "Can't open /proc/cpuinfo : $!";
+
+my %models;
+my %packages;
+my %cores;
+
+my %map = (
+    'model name'  => \%models,
+    'physical id' => \%packages,
+    'core id'     => \%cores
+);
+
+my $cpu = 0;
+while (<$cpuinfo>) {
+    chomp;
+    my ( $tag, $val ) = split /:/;
+    if ( !$tag ) {
+        ++$cpu;
+        next;
+    }
+
+    $tag =~ s/\s+$//;
+    $val =~ s/^\s+//;
+
+    my $ref = $map{$tag};
+    $ref->{$val} = $cpu  if ($ref);
+}
+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";
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
-- 
cgit v1.2.3