From 6695763f68fbf3acfb6c69739deca28217eaf8ef Mon Sep 17 00:00:00 2001
From: Tom Grennan <tgrennan@vyatta.com>
Date: Thu, 20 Mar 2008 13:43:35 -0700
Subject: fix bug 3017

don't pipe through VYATTA_PAGER if run_cmd itself is a pager or tail
---
 templates/show/log/all/node.def                  | 2 +-
 templates/show/log/file/node.tag/node.def        | 4 ++--
 templates/show/log/node.def                      | 2 +-
 templates/show/system/boot-messages/all/node.def | 2 +-
 templates/show/system/boot-messages/node.def     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'templates/show')

diff --git a/templates/show/log/all/node.def b/templates/show/log/all/node.def
index 87e959b..8df54f5 100644
--- a/templates/show/log/all/node.def
+++ b/templates/show/log/all/node.def
@@ -1,2 +1,2 @@
 help: Show contents of all master log files
-run: ${vyatta_bindir}/vyatta-show-log-all
+run: less $_vyatta_less_options -- `printf "%s\n" /var/log/messages* | sort -nr`
diff --git a/templates/show/log/file/node.tag/node.def b/templates/show/log/file/node.tag/node.def
index a5a1c9d..5b80669 100644
--- a/templates/show/log/file/node.tag/node.def
+++ b/templates/show/log/file/node.tag/node.def
@@ -1,5 +1,5 @@
 help: Show contents of user-defined log file
 allowed: local -a array ;
          array=( /var/log/user/* ) ;
-         echo  -n ${array[@]##*/}
-run: ${vyatta_bindir}/vyatta-show-log-file "$4"
+         [ ${#array[@]} -gt 0 ] && echo  -n ${array[@]##*/} || echo -n none
+run: less $_vyatta_less_options -- /var/log/user/$4
diff --git a/templates/show/log/node.def b/templates/show/log/node.def
index 5f61e1d..13fad84 100644
--- a/templates/show/log/node.def
+++ b/templates/show/log/node.def
@@ -1,2 +1,2 @@
 help: Show contents of current master log file
-run: ${vyatta_bindir}/vyatta-show-log
+run: less $_vyatta_less_options /var/log/messages
diff --git a/templates/show/system/boot-messages/all/node.def b/templates/show/system/boot-messages/all/node.def
index b151fc2..d472c33 100644
--- a/templates/show/system/boot-messages/all/node.def
+++ b/templates/show/system/boot-messages/all/node.def
@@ -1,2 +1,2 @@
 help: Show all kernel boot messages
-run: ${vyatta_bindir}/vyatta-show-dmesg-all
+run: less $_vyatta_less_options -- `printf "%s\n" /var/log/dmesg* | sort -nr`
diff --git a/templates/show/system/boot-messages/node.def b/templates/show/system/boot-messages/node.def
index 7cfe5d3..ee5ae38 100644
--- a/templates/show/system/boot-messages/node.def
+++ b/templates/show/system/boot-messages/node.def
@@ -1,2 +1,2 @@
 help: Show most recent kernel boot messages
-run: ${vyatta_bindir}/vyatta-show-dmesg
+run: less $_vyatta_less_options /var/log/dmesg
-- 
cgit v1.2.3