From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonatan Schlag To: network@lists.ipfire.org Subject: [PATCH] zone: response with an error if a zone is already up or down Date: Tue, 25 Jul 2017 15:13:57 +0200 Message-ID: <1500988437-3732-1-git-send-email-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3086595438643531277==" List-Id: --===============3086595438643531277== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Fixes: #11368 Signed-off-by: Jonatan Schlag --- src/functions/functions.zone | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/functions/functions.zone b/src/functions/functions.zone index 91ce629..eccca3a 100644 --- a/src/functions/functions.zone +++ b/src/functions/functions.zone @@ -369,6 +369,12 @@ zone_up() { return ${EXIT_ERROR} fi + # Check if the zone is already up + if zone_is_active ${zone}; then + log ERROR "Zone ${zone} is already up" + return ${EXIT_ERROR} + fi + # Check if a zone has got the remove tag. if zone_has_destroy_tag ${zone}; then error "Cannot bring up any zone which is to be removed." @@ -405,6 +411,13 @@ zone_down() { return ${EXIT_ERROR} fi + # Check if the zone is already down + if ! zone_is_active ${zone}; then + log ERROR "Zone ${zone} is already down" + return ${EXIT_ERROR} + fi + + local hook="$(zone_get_hook "${zone}")" if [ -z "${hook}" ]; then error "Config file did not provide any hook." -- 2.6.3 --===============3086595438643531277==--