diff options
| -rw-r--r-- | etc/default/vyatta-cfg | 5 | ||||
| -rwxr-xr-x | scripts/VyattaConfigLoad.pm | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/etc/default/vyatta-cfg b/etc/default/vyatta-cfg index e560788..dfb4006 100644 --- a/etc/default/vyatta-cfg +++ b/etc/default/vyatta-cfg @@ -7,13 +7,14 @@ declare -x -r VYATTA_CHANGES_ONLY_DIR=${vyatta_configdir}/tmp/changes_only_$$ declare -x -r VYATTA_TEMP_CONFIG_DIR=${vyatta_configdir}/tmp/new_config_$$ declare -x -r VYATTA_CONFIG_TMP=${vyatta_configdir}/tmp/tmp_$$ declare -x -r VYATTA_CONFIG_TEMPLATE=$vyatta_cfg_templates -declare -x -r VYATTA_EDIT_LEVEL=/ -declare -x -r VYATTA_TEMPLATE_LEVEL=/ declare -x -r VYATTA_TAG_NAME=node.tag declare -x -r VYATTA_MOD_NAME=.modified declare -x -r VYATTA_CFG_GROUP_NAME=vyattacfg } 2>/dev/null || : +declare -x VYATTA_EDIT_LEVEL=/ +declare -x VYATTA_TEMPLATE_LEVEL=/ + # don't set level if already set if [ -n "$VYATTA_USER_LEVEL_DIR" ]; then return diff --git a/scripts/VyattaConfigLoad.pm b/scripts/VyattaConfigLoad.pm index eae2946..efec951 100755 --- a/scripts/VyattaConfigLoad.pm +++ b/scripts/VyattaConfigLoad.pm @@ -209,7 +209,7 @@ sub findDeletedValues { # for "multi:" nodes, need to sort the values by the original order. my @nvals = getSortedMultiValues($new_ref, \@active_path); if ($is_text) { - @nvals = map { /^"(.*)"$/; $1; } @nvals; + @nvals = map { /^"(.*)"$/ ? $1 : $_ }@nvals; } my @ovals = $active_cfg->returnOrigValues(''); my %comp_hash = $active_cfg->compareValueLists(\@ovals, \@nvals); @@ -261,7 +261,7 @@ sub findSetValues { # for "multi:" nodes, need to sort the values by the original order. my @nvals = getSortedMultiValues($new_ref, \@active_path); if ($is_text) { - @nvals = map { /^"(.*)"$/; $1; } @nvals; + @nvals = map { /^"(.*)"$/ ? $1 : $_ } @nvals; } my @ovals = $active_cfg->returnOrigValues(''); my %comp_hash = $active_cfg->compareValueLists(\@ovals, \@nvals); |