summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Davidson <james.davidson@vyatta.com>2012-08-28 16:58:51 -0700
committerJames Davidson <james.davidson@vyatta.com>2012-08-28 16:58:51 -0700
commitb2fa9e67ea806f4dc10c9eeed727e11356ca9b67 (patch)
tree8b5b6f94a0416711ee6a63febd85c3b7b000cc21
parent1eeb2c70a1cf8e90187b9aa3917d67cfaca44540 (diff)
downloadvyatta-op-b2fa9e67ea806f4dc10c9eeed727e11356ca9b67.tar.gz
vyatta-op-b2fa9e67ea806f4dc10c9eeed727e11356ca9b67.zip
Move display of entitlement info to the top of tech-support output
Also, only attempt to display entitlement info if it is present. Fixes bug 8260
-rwxr-xr-xfunctions/tech-support7
1 files changed, 4 insertions, 3 deletions
diff --git a/functions/tech-support b/functions/tech-support
index 570ef2d..088158a 100755
--- a/functions/tech-support
+++ b/functions/tech-support
@@ -70,6 +70,10 @@ export PATH=/sbin:/usr/sbin:$PATH
header Show Tech-Support
header CONFIGURATION
+if cli-shell-api validateTmplPath entitlement; then
+header Entitlement
+show entitlement
+fi
header Vyatta Version and Package Changes
show version all
@@ -362,9 +366,6 @@ last -ix
header Recent Log Messages
tail -n 250 /var/log/messages
-header Entitlement
-show entitlement
-
header NTP
show ntp