diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-10-14 19:00:50 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-10-14 19:00:50 +0200 |
| commit | 12c9b5870d2ca82885d1d78266efcd5feba5ee3c (patch) | |
| tree | 3cb94a6c46c7c3811a8c2f16ee25a40e140b7343 | |
| parent | a2a1fa507187b41b0100ffe0ae7c8317055fec23 (diff) | |
| download | vyatta-cfg-system-12c9b5870d2ca82885d1d78266efcd5feba5ee3c.tar.gz vyatta-cfg-system-12c9b5870d2ca82885d1d78266efcd5feba5ee3c.zip | |
T898: use the new script for checking if a bridge still has active members.
| -rw-r--r-- | templates/interfaces/bridge/node.def | 6 |
1 files changed, 2 insertions, 4 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(@); |