From 97238661d34432eac6c8df62a28367da941f3e37 Mon Sep 17 00:00:00 2001
From: Michael Larson <slioch@eng-140.vyatta.com>
Date: Tue, 17 Jun 2008 14:06:55 -0700
Subject: fix for bug 110. added discard command to configure mode. This
 command deletes local changes and keeps the user in configure mode.

---
 etc/shell/level/users/allowed-op | 1 +
 1 file changed, 1 insertion(+)

(limited to 'etc/shell')

diff --git a/etc/shell/level/users/allowed-op b/etc/shell/level/users/allowed-op
index 724c235..5b997da 100644
--- a/etc/shell/level/users/allowed-op
+++ b/etc/shell/level/users/allowed-op
@@ -1,3 +1,4 @@
+discard
 clear
 debug
 exit
-- 
cgit v1.2.3


From d510ee758bdf20507f0b9dceb52e737a37452be7 Mon Sep 17 00:00:00 2001
From: Mohit Mehta <mohit.mehta@vyatta.com>
Date: Sat, 21 Jun 2008 21:55:37 +0000
Subject: add release and renew to allowed-op file so that operator is able to
 execute them

---
 etc/shell/level/users/allowed-op | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'etc/shell')

diff --git a/etc/shell/level/users/allowed-op b/etc/shell/level/users/allowed-op
index 5b997da..337a5b2 100644
--- a/etc/shell/level/users/allowed-op
+++ b/etc/shell/level/users/allowed-op
@@ -5,6 +5,8 @@ exit
 no
 ping
 reboot
+release
+renew
 set
 show
 telnet
-- 
cgit v1.2.3


From 4c0cb014d55882ed769a89d9d630bd1160d4ef54 Mon Sep 17 00:00:00 2001
From: Michael Larson <slioch@eng-140.vyatta.com>
Date: Wed, 25 Jun 2008 11:53:19 -0700
Subject: fixed non-root user access for discard. also moved help string.

---
 etc/bash_completion.d/20vyatta-cfg | 6 ++++--
 etc/shell/level/users/allowed-op   | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'etc/shell')

diff --git a/etc/bash_completion.d/20vyatta-cfg b/etc/bash_completion.d/20vyatta-cfg
index d501019..f1d100e 100755
--- a/etc/bash_completion.d/20vyatta-cfg
+++ b/etc/bash_completion.d/20vyatta-cfg
@@ -76,8 +76,8 @@ discard ()
     fi
 
     sudo umount ${VYATTA_TEMP_CONFIG_DIR};
-    rm -fr ${VYATTA_CHANGES_ONLY_DIR};
-    mkdir -p ${VYATTA_CHANGES_ONLY_DIR};
+    sudo rm -fr ${VYATTA_CHANGES_ONLY_DIR};
+    sudo mkdir -p ${VYATTA_CHANGES_ONLY_DIR};
     sudo mount -t unionfs -o dirs=${VYATTA_CHANGES_ONLY_DIR}=rw:${VYATTA_ACTIVE_CONFIGURATION_DIR}=ro unionfs ${VYATTA_TEMP_CONFIG_DIR};
     
     if (( changes )); then
@@ -814,6 +814,7 @@ vyatta_config_complete ()
   if (( ${#COMP_WORDS[@]} < 2 )); then
     declare -a hitems=( "commit" \
                         "delete" \
+	                "discard" \
                         "edit" \
                         "exit" \
                         "load" \
@@ -824,6 +825,7 @@ vyatta_config_complete ()
     declare -a hstrs=( \
       "Commit the current set of changes" \
       "Delete a configuration element" \
+      "Discard uncommitted changes" \
       "Edit a sub-element" \
       "Exit from this configuration level" \
       "Load configuration from a file" \
diff --git a/etc/shell/level/users/allowed-op b/etc/shell/level/users/allowed-op
index 5b997da..724c235 100644
--- a/etc/shell/level/users/allowed-op
+++ b/etc/shell/level/users/allowed-op
@@ -1,4 +1,3 @@
-discard
 clear
 debug
 exit
-- 
cgit v1.2.3


From 3b1043be67c60220c107e42998635c628eb84393 Mon Sep 17 00:00:00 2001
From: Mohit Mehta <mohit.mehta@vyatta.com>
Date: Sun, 22 Jun 2008 03:50:46 +0000
Subject: add top level op-mode commands: 'connect', 'delete', 'disconnect',
 and 'terminal' to allowed-op file so that they not flagged as invalid
 commands when logged in as a operator level user

---
 etc/shell/level/users/allowed-op | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'etc/shell')

diff --git a/etc/shell/level/users/allowed-op b/etc/shell/level/users/allowed-op
index 9fc7fa0..c387a99 100644
--- a/etc/shell/level/users/allowed-op
+++ b/etc/shell/level/users/allowed-op
@@ -1,5 +1,8 @@
 clear
+connect
 debug
+delete
+disconnect
 exit
 no
 ping
@@ -9,6 +12,7 @@ renew
 set
 show
 telnet
+terminal
 traceroute
 undebug
 vpn
-- 
cgit v1.2.3