diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-10-28 19:30:06 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-10-28 19:30:06 +0100 |
| commit | 37db2e326b290c9c756eecfe08c464e8b627a682 (patch) | |
| tree | caf104e0fda4f23f829b2945a316c7da2a6554f7 /templates | |
| parent | 13a053c14c402fa0f7be174adbe9cfa53e811369 (diff) | |
| parent | 6daba1eb14430aa02f8f56614188a598b383c8ef (diff) | |
| download | vyatta-cfg-system-37db2e326b290c9c756eecfe08c464e8b627a682.tar.gz vyatta-cfg-system-37db2e326b290c9c756eecfe08c464e8b627a682.zip | |
Merge branch 'current' into crux
Conflicts:
Makefile.am
debian/changelog
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/interfaces/bridge/node.def | 6 | ||||
| -rw-r--r-- | templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/bridge/node.def | 6 | ||||
| -rw-r--r-- | templates/system/login/user/node.def | 1 |
3 files changed, 8 insertions, 5 deletions
diff --git a/templates/interfaces/bridge/node.def b/templates/interfaces/bridge/node.def index b6654f07..cda535d5 100644 --- a/templates/interfaces/bridge/node.def +++ b/templates/interfaces/bridge/node.def @@ -11,10 +11,8 @@ create: /sbin/brctl addbr $VAR(@) fi sudo ip link set $VAR(@) up -delete: if ! /opt/vyatta/sbin/vyatta-bridgegroup-depedency.pl \ - --no-interfaces-assigned \ - --bridge-interface="$VAR(@)"; then \ - exit 1 +delete: if ! ${vyos_conf_scripts_dir}/bridge_has_members.py $VAR(@); then + exit 1; fi sudo ip link set $VAR(@) down; sudo /sbin/brctl delbr $VAR(@); diff --git a/templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/bridge/node.def b/templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/bridge/node.def index 85666c41..84d2c983 100644 --- a/templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/bridge/node.def +++ b/templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/bridge/node.def @@ -13,4 +13,8 @@ create: echo interfaces tunnel $VAR(../../../../@) bridge-group bridge $VAR(@): tunnel encapsulation type must be gre-bridge exit 1 fi -delete: sudo brctl delif $VAR(@) $VAR(../../../../@) +delete: if [ -d /sys/class/net/$VAR(@) ]; then + sudo brctl delif $VAR(@) $VAR(../../../../@) + else + exit 0 + fi diff --git a/templates/system/login/user/node.def b/templates/system/login/user/node.def index 451cc078..5f83fe54 100644 --- a/templates/system/login/user/node.def +++ b/templates/system/login/user/node.def @@ -3,6 +3,7 @@ type: txt help: User account information syntax:expression: exec "/opt/vyatta/sbin/vyatta_check_username.pl $VAR(@)" +syntax:expression: exec "${vyos_libexec_dir}/validate-value.py --regex \'^[a-zA-Z0-9\-_]{1,100}\' --value \'$VAR(@)\'"; "illegal characters in username or longer than 100 chars" commit:expression: $VAR(@) == "" || $VAR(authentication/plaintext-password) != "" || |