diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-03-31 16:49:03 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-03-31 16:49:03 -0700 |
| commit | 454ba249959ca26b512030c259b02ddc89f24582 (patch) | |
| tree | 2bb98c0b5efdf9a5d85dc3f39163874a7008927d /etc | |
| parent | 0a350b99308762f1eb180aa47b64db78b3187c7e (diff) | |
| parent | 388d5ed2580bc9ef7ee7a8cdc1d75126ea97a53e (diff) | |
| download | vyatta-cfg-454ba249959ca26b512030c259b02ddc89f24582.tar.gz vyatta-cfg-454ba249959ca26b512030c259b02ddc89f24582.zip | |
Merge branch 'glendale' of suva.vyatta.com:/git/vyatta-cfg into glendale
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/bash_completion.d/20vyatta-cfg | 5 | ||||
| -rwxr-xr-x | etc/init.d/vyatta-ofr | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/etc/bash_completion.d/20vyatta-cfg b/etc/bash_completion.d/20vyatta-cfg index 4ad86ce..f979939 100755 --- a/etc/bash_completion.d/20vyatta-cfg +++ b/etc/bash_completion.d/20vyatta-cfg @@ -440,7 +440,10 @@ vyatta_parse_tmpl () vyatta_cfg_comp_help=$(vyatta_parse_tmpl_comp_fields $1 "comp_help") if (( ${#vyatta_cfg_allowed[@]} == 0 )); then - local -a ares=( $(eval "$acmd") ) + astr=$(eval "$acmd") + astr=${astr//</\\<} + astr=${astr//>/\\>} + eval "ares=( $astr )" for (( i=0 ; i<${#ares[@]} ; i++ )); do if [[ "${ares[i]}" != \<*\> ]]; then vyatta_cfg_allowed+=( "${ares[i]}" ) diff --git a/etc/init.d/vyatta-ofr b/etc/init.d/vyatta-ofr index b1e7a69..776aaf4 100755 --- a/etc/init.d/vyatta-ofr +++ b/etc/init.d/vyatta-ofr @@ -66,6 +66,11 @@ have_rl_system () { # if necessary, provide initial config init_bootfile () { + if [ -f $BOOTFILE ] && grep -q '/\*XORP Configuration File, v1.0\*/' \ + $BOOTFILE >&/dev/null; then + CURTIME=$(date +%F-%H%M%S) + mv $BOOTFILE $BOOTFILE.pre-glendale.$CURTIME + fi if [ ! -f $BOOTFILE ] ; then if [ -f $vyatta_sysconfdir/config.boot.default ]; then cp $vyatta_sysconfdir/config.boot.default $BOOTFILE |