diff options
| author | Daniil Baturin <daniil@baturin.org> | 2015-02-20 15:53:24 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2015-02-20 15:55:41 +0100 |
| commit | affd54db77ed309e70b89d36a884c1cf0b7249bd (patch) | |
| tree | 7ccb2740c0172fb4a7bf6718ba4021966974ef0e | |
| parent | 6ba5c5457330a7cd481fd85c856a8163e061d714 (diff) | |
| download | vyatta-cfg-system-affd54db77ed309e70b89d36a884c1cf0b7249bd.tar.gz vyatta-cfg-system-affd54db77ed309e70b89d36a884c1cf0b7249bd.zip | |
Bug #492: fail commit in case of DHCPv6 configuration errors.
13 files changed, 39 insertions, 0 deletions
diff --git a/templates/interfaces/bonding/node.tag/dhcpv6-options/node.def b/templates/interfaces/bonding/node.tag/dhcpv6-options/node.def index 87e69255..225bd926 100644 --- a/templates/interfaces/bonding/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/bonding/node.tag/dhcpv6-options/node.def @@ -44,6 +44,9 @@ end: echo "Re-starting DHCPv6 client on ${ifname}..." sudo /opt/vyatta/sbin/vyatta-dhcpv6-client.pl --stop --start \ --ifname $ifname $arg1 $arg2 + if [ $? != 0 ]; then + exit 1 + fi echo "Done." exit 0 diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/dhcpv6-options/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/dhcpv6-options/node.def index 947bc5de..86b5560f 100644 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/bonding/node.tag/vif-s/node.tag/dhcpv6-options/node.def @@ -43,5 +43,8 @@ end: echo "Re-starting DHCPv6 client on ${ifname}..." sudo /opt/vyatta/sbin/vyatta-dhcpv6-client.pl --stop --start \ --ifname $ifname $arg1 $arg2 + if [ $? != 0 ]; then + exit 1 + fi exit 0 diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def index a3de12ce..ef4c13ad 100644 --- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def @@ -43,5 +43,8 @@ end: echo "Re-starting DHCPv6 client on ${ifname}..." sudo /opt/vyatta/sbin/vyatta-dhcpv6-client.pl --stop --start \ --ifname $ifname $arg1 $arg2 + if [ $? != 0 ]; then + exit 1 + fi exit 0 diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/dhcpv6-options/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/dhcpv6-options/node.def index 9cf861b4..81e7055d 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/dhcpv6-options/node.def @@ -43,5 +43,8 @@ end: echo "Re-starting DHCPv6 client on ${ifname}..." sudo /opt/vyatta/sbin/vyatta-dhcpv6-client.pl --stop --start \ --ifname $ifname $arg1 $arg2 + if [ $? != 0 ]; then + exit 1 + fi exit 0 diff --git a/templates/interfaces/bridge/node.tag/dhcpv6-options/node.def b/templates/interfaces/bridge/node.tag/dhcpv6-options/node.def index 87e69255..225bd926 100644 --- a/templates/interfaces/bridge/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/bridge/node.tag/dhcpv6-options/node.def @@ -44,6 +44,9 @@ end: echo "Re-starting DHCPv6 client on ${ifname}..." sudo /opt/vyatta/sbin/vyatta-dhcpv6-client.pl --stop --start \ --ifname $ifname $arg1 $arg2 + if [ $? != 0 ]; then + exit 1 + fi echo "Done." exit 0 diff --git a/templates/interfaces/ethernet/node.tag/dhcpv6-options/node.def b/templates/interfaces/ethernet/node.tag/dhcpv6-options/node.def index 87e69255..225bd926 100644 --- a/templates/interfaces/ethernet/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/ethernet/node.tag/dhcpv6-options/node.def @@ -44,6 +44,9 @@ end: echo "Re-starting DHCPv6 client on ${ifname}..." sudo /opt/vyatta/sbin/vyatta-dhcpv6-client.pl --stop --start \ --ifname $ifname $arg1 $arg2 + if [ $? != 0 ]; then + exit 1 + fi echo "Done." exit 0 diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcpv6-options/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcpv6-options/node.def index 947bc5de..86b5560f 100644 --- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcpv6-options/node.def @@ -43,5 +43,8 @@ end: echo "Re-starting DHCPv6 client on ${ifname}..." sudo /opt/vyatta/sbin/vyatta-dhcpv6-client.pl --stop --start \ --ifname $ifname $arg1 $arg2 + if [ $? != 0 ]; then + exit 1 + fi exit 0 diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def index a3de12ce..ef4c13ad 100644 --- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def @@ -43,5 +43,8 @@ end: echo "Re-starting DHCPv6 client on ${ifname}..." sudo /opt/vyatta/sbin/vyatta-dhcpv6-client.pl --stop --start \ --ifname $ifname $arg1 $arg2 + if [ $? != 0 ]; then + exit 1 + fi exit 0 diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcpv6-options/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcpv6-options/node.def index 947bc5de..86b5560f 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcpv6-options/node.def @@ -43,5 +43,8 @@ end: echo "Re-starting DHCPv6 client on ${ifname}..." sudo /opt/vyatta/sbin/vyatta-dhcpv6-client.pl --stop --start \ --ifname $ifname $arg1 $arg2 + if [ $? != 0 ]; then + exit 1 + fi exit 0 diff --git a/templates/interfaces/pseudo-ethernet/node.tag/dhcpv6-options/node.def b/templates/interfaces/pseudo-ethernet/node.tag/dhcpv6-options/node.def index 87e69255..225bd926 100644 --- a/templates/interfaces/pseudo-ethernet/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/pseudo-ethernet/node.tag/dhcpv6-options/node.def @@ -44,6 +44,9 @@ end: echo "Re-starting DHCPv6 client on ${ifname}..." sudo /opt/vyatta/sbin/vyatta-dhcpv6-client.pl --stop --start \ --ifname $ifname $arg1 $arg2 + if [ $? != 0 ]; then + exit 1 + fi echo "Done." exit 0 diff --git a/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/dhcpv6-options/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/dhcpv6-options/node.def index 947bc5de..86b5560f 100644 --- a/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/dhcpv6-options/node.def @@ -43,5 +43,8 @@ end: echo "Re-starting DHCPv6 client on ${ifname}..." sudo /opt/vyatta/sbin/vyatta-dhcpv6-client.pl --stop --start \ --ifname $ifname $arg1 $arg2 + if [ $? != 0 ]; then + exit 1 + fi exit 0 diff --git a/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def index a3de12ce..ef4c13ad 100644 --- a/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def @@ -43,5 +43,8 @@ end: echo "Re-starting DHCPv6 client on ${ifname}..." sudo /opt/vyatta/sbin/vyatta-dhcpv6-client.pl --stop --start \ --ifname $ifname $arg1 $arg2 + if [ $? != 0 ]; then + exit 1 + fi exit 0 diff --git a/templates/interfaces/pseudo-ethernet/node.tag/vif/node.tag/dhcpv6-options/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif/node.tag/dhcpv6-options/node.def index 947bc5de..86b5560f 100644 --- a/templates/interfaces/pseudo-ethernet/node.tag/vif/node.tag/dhcpv6-options/node.def +++ b/templates/interfaces/pseudo-ethernet/node.tag/vif/node.tag/dhcpv6-options/node.def @@ -43,5 +43,8 @@ end: echo "Re-starting DHCPv6 client on ${ifname}..." sudo /opt/vyatta/sbin/vyatta-dhcpv6-client.pl --stop --start \ --ifname $ifname $arg1 $arg2 + if [ $? != 0 ]; then + exit 1 + fi exit 0 |