diff options
| author | Bob Gilligan <gilligan@vyatta.com> | 2011-08-07 15:23:43 -0700 |
|---|---|---|
| committer | Bob Gilligan <gilligan@vyatta.com> | 2011-08-07 15:23:43 -0700 |
| commit | ac5ec93d8f2d08f35e2dd465d9d053f511e21767 (patch) | |
| tree | 18ec7f40c029e6dfb728314fcdcc5a31ab88ae1f | |
| parent | 78790c7f4a61d306502ba80f8d57f2272bc6d2b1 (diff) | |
| parent | 85bc6f3badc332fa24f95b0e5a40f725c21c4478 (diff) | |
| download | vyatta-op-ac5ec93d8f2d08f35e2dd465d9d053f511e21767.tar.gz vyatta-op-ac5ec93d8f2d08f35e2dd465d9d053f511e21767.zip | |
Merge branch 'napa' of http://git.vyatta.com/vyatta-op into napa
Conflicts:
debian/changelog
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | templates/show/history/brief/node.def | 4 | ||||
| -rw-r--r-- | templates/show/history/node.def | 4 | ||||
| -rw-r--r-- | templates/show/history/node.tag/node.def | 5 |
4 files changed, 13 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 9a4809f..99fba9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ vyatta-op (0.13.152+napa2) unstable; urgency=low - * Bugfix 7304: Bring DHCPv6 client leases script back into the - release. + * Bugfix 7266: make 'show history' work with non interactive shells + like webgui - -- Bob Gilligan <gilligan@vyatta.com> Sun, 07 Aug 2011 15:00:52 -0700 + -- John Southworth <john.southworth@vyatta.com> Fri, 08 Jul 2011 17:12:18 -0500 vyatta-op (0.13.152+napa1) unstable; urgency=low diff --git a/templates/show/history/brief/node.def b/templates/show/history/brief/node.def index c1a81a3..4dc73c1 100644 --- a/templates/show/history/brief/node.def +++ b/templates/show/history/brief/node.def @@ -1,2 +1,4 @@ help: recent command history -run: history 20 +run: HISTFILE="$HOME/.bash_history" + \set -o history + history 20 diff --git a/templates/show/history/node.def b/templates/show/history/node.def index 787ebd9..21e79e7 100644 --- a/templates/show/history/node.def +++ b/templates/show/history/node.def @@ -1,2 +1,4 @@ help: show command history -run: history +run: HISTFILE="$HOME/.bash_history" + \set -o history + history diff --git a/templates/show/history/node.tag/node.def b/templates/show/history/node.tag/node.def index a8c3755..2075cde 100644 --- a/templates/show/history/node.tag/node.def +++ b/templates/show/history/node.tag/node.def @@ -1,3 +1,6 @@ help: Display last N commands in history allowed: echo -n '<NUMBER>' -run: HISTTIMEFORMAT='%FT%T%z ' history $3 +run: HISTTIMEFORMAT='%FT%T%z ' + HISTFILE="$HOME/.bash_history" + \set -o history + history $3 |