9 files changed, 28 insertions, 9 deletions
diff --git a/templates/show/hardware/cpu/node.def b/templates/show/hardware/cpu/node.def
index 4339af2..2e3c616 100644
--- a/templates/show/hardware/cpu/node.def
+++ b/templates/show/hardware/cpu/node.def
@@ -1,2 +1,4 @@
 help: Show system CPU details
-run: cat /proc/cpuinfo
+run: less $_vyatta_less_options \
+	--prompt=".cpu info" \
+	-- /proc/cpuinfo
diff --git a/templates/show/hardware/mem/node.def b/templates/show/hardware/mem/node.def
index 7a54e52..acf1109 100644
--- a/templates/show/hardware/mem/node.def
+++ b/templates/show/hardware/mem/node.def
@@ -1,2 +1,4 @@
 help: Show system RAM details
-run: cat /proc/meminfo
+run: less $_vyatta_less_options \
+	--prompt=".mem info" \
+	-- /proc/meminfo
diff --git a/templates/show/license/node.def b/templates/show/license/node.def
index eadfbbf..2108f30 100644
--- a/templates/show/license/node.def
+++ b/templates/show/license/node.def
@@ -1,2 +1,4 @@
 help: Show Vyatta license information
-run:  cat ${vyatta_sysconfdir}/LICENSE
+run:  less $_vyatta_less_options \
+	--prompt=".license, page %dt of %D" \
+	-- ${vyatta_sysconfdir}/LICENSE
diff --git a/templates/show/log/all/node.def b/templates/show/log/all/node.def
index 87e959b..069d1d4 100644
--- a/templates/show/log/all/node.def
+++ b/templates/show/log/all/node.def
@@ -1,2 +1,4 @@
 help: Show contents of all master log files
-run: ${vyatta_bindir}/vyatta-show-log-all
+run: less $_vyatta_less_options \
+	--prompt=".log?m, file %i of %m., page %dt of %D" \
+	-- `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..f62a334 100644
--- a/templates/show/log/file/node.tag/node.def
+++ b/templates/show/log/file/node.tag/node.def
@@ -1,5 +1,7 @@
 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 \
+	--prompt=".$4 log, page %dt of %D" \
+	-- /var/log/user/$4
diff --git a/templates/show/log/node.def b/templates/show/log/node.def
index 5f61e1d..3d37d84 100644
--- a/templates/show/log/node.def
+++ b/templates/show/log/node.def
@@ -1,2 +1,4 @@
 help: Show contents of current master log file
-run: ${vyatta_bindir}/vyatta-show-log
+run: less $_vyatta_less_options \
+	--prompt=".log, page %dt of %D" \
+	-- /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..e414987 100644
--- a/templates/show/system/boot-messages/all/node.def
+++ b/templates/show/system/boot-messages/all/node.def
@@ -1,2 +1,4 @@
 help: Show all kernel boot messages
-run: ${vyatta_bindir}/vyatta-show-dmesg-all
+run: less $_vyatta_less_options \
+	--prompt=".boot-messages?m, file %i of %m., page %dt of %D" \
+	-- `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..97bbb61 100644
--- a/templates/show/system/boot-messages/node.def
+++ b/templates/show/system/boot-messages/node.def
@@ -1,2 +1,4 @@
 help: Show most recent kernel boot messages
-run: ${vyatta_bindir}/vyatta-show-dmesg
+run: less $_vyatta_less_options \
+	--prompt=".boot-messages, page %dt of %D" \
+	-- /var/log/dmesg
diff --git a/templates/show/vrrp/summary/node.def b/templates/show/vrrp/summary/node.def
new file mode 100644
index 0000000..33333c4
--- /dev/null
+++ b/templates/show/vrrp/summary/node.def
@@ -0,0 +1,3 @@
+help: Show VRRP summary
+run: /opt/vyatta/sbin/vyatta-show-vrrp.pl "$3"
+