summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorBob Gilligan <gilligan@vyatta.com>2008-02-26 16:52:11 -0800
committerBob Gilligan <gilligan@vyatta.com>2008-02-26 16:52:11 -0800
commitf9ee85510c958f07191cdbb7c3f57f2cf226a6d3 (patch)
tree47f55dc322dcaa83f3bdb2fd5caa2388e8ff4b8b /etc
parent79eb089b0d3463823f0a1fba1376842e3eb8aa47 (diff)
parentaf75cfaa93b1ac933bb8b5ecec64fcc0c269a013 (diff)
downloadvyatta-cfg-f9ee85510c958f07191cdbb7c3f57f2cf226a6d3.tar.gz
vyatta-cfg-f9ee85510c958f07191cdbb7c3f57f2cf226a6d3.zip
Merge branch 'glendale' of git:/git/vyatta-cfg into glendale
Diffstat (limited to 'etc')
-rw-r--r--etc/bash_completion.d/20vyatta-cfg4
-rwxr-xr-xetc/init.d/vyatta-ofr2
-rw-r--r--etc/shell/level/users/allowed-op14
3 files changed, 14 insertions, 6 deletions
diff --git a/etc/bash_completion.d/20vyatta-cfg b/etc/bash_completion.d/20vyatta-cfg
index 7d0b633..5966e18 100644
--- a/etc/bash_completion.d/20vyatta-cfg
+++ b/etc/bash_completion.d/20vyatta-cfg
@@ -61,7 +61,7 @@ show ()
save ()
{
- eval "sudo sg quaggavty \
+ eval "sudo sg vyattacfg \
\"umask 0002 ; ${vyatta_sbindir}/vyatta-save-config.pl $@\""
}
@@ -968,7 +968,7 @@ vyatta_config_complete ()
eval $restore_shopts
}
-DEF_GROUP=quaggavty
+DEF_GROUP=vyattacfg
make_vyatta_config_dir ()
{
sudo mkdir -m 0775 -p $1
diff --git a/etc/init.d/vyatta-ofr b/etc/init.d/vyatta-ofr
index 32eb554..89914c4 100755
--- a/etc/init.d/vyatta-ofr
+++ b/etc/init.d/vyatta-ofr
@@ -55,7 +55,7 @@ else
subinit+=( rtrmgr )
GROUP=xorp
else
- GROUP=quaggavty
+ GROUP=vyattacfg
fi
fi
diff --git a/etc/shell/level/users/allowed-op b/etc/shell/level/users/allowed-op
index c2c2482..498d120 100644
--- a/etc/shell/level/users/allowed-op
+++ b/etc/shell/level/users/allowed-op
@@ -1,6 +1,14 @@
-show
-terminal
+clear
+debug
exit
-telnet
+init-floppy
+no
ping
+reboot
+set
+show
+telnet
+terminal
traceroute
+undebug
+vpn