From patchwork Sun Jul 1 01:53:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonatan Schlag X-Patchwork-Id: 1854 Return-Path: Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.i.ipfire.org (Postfix) with ESMTP id 48C336095C for ; Sat, 30 Jun 2018 17:53:54 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [127.0.0.1]) by mail01.ipfire.org (Postfix) with ESMTP id 2638A10910C5; Sat, 30 Jun 2018 16:53:54 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1530374034; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references:list-id: list-unsubscribe:list-subscribe:list-post; bh=JMCnoeK2EyKhiZcnw0nrrjY0HdNxFEhiOsQtYsb2L7c=; b=XUSIiZMeNVG98A93nmgRRoz8Lf+p+yibaSptUq5wXlC7oR5Fe/1ZoZPAehIi5PZy995fBi /PKtnVAhi1WFMbh+XFfTau9oLpXeX+eJVmd3nQtI7GmSYSSbkIQz+WjhMydzxeNYD09ws9 y71WRh+5HRC+JKQgbZt8P4luWp6rjSA3APdARq2mew1lImb7B6xQUk1A7QisTb6mARp4hd c6SIieNiFkupCEiEVmeWnNMlr7Xc6Korgw5eIRRPPiabMyOfCB1WCsz2toFgtMEviKN5Gv vuHBgAz4GSWeKRKOlFgN1xkQmxrpWscmb0vlE6f4bv1eVwH8UoDF+X958C40ew== Received: from bockland.local.familyschlag (unknown [46.183.103.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id E87CA105FCE7; Sat, 30 Jun 2018 16:53:51 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1530374032; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=JMCnoeK2EyKhiZcnw0nrrjY0HdNxFEhiOsQtYsb2L7c=; b=0AKdIYe+QUCdDQWthYsxo1G3OKPY6QfYjDJruaL76d4F2XS7hNoV0WucAbP/Q+O2EBNa7R rcRBTe/0EGC95m9t314dEcfWXtgkPrmUWQjCZfRpKwU0mJ5fn5MM9x+fL7ci4olvb5m6ZV DA5yeVCeEniz8Ch7WRkEOQMxKEWQRcvky2t665KNSvYv7JFVqvrKxWk7y6HmR3uGsPIBkn YMu6hBZ3aXF+vMGAj4Y33yLn93HbtP9d0pExLSc/BDsCoqi4mxNK11iTxg+pmmnlAk9kFp mB24NbRQ8mvBBkqXcTbCGXGp3DSeLSSjBuU38rd9M4XwECcuxIDu+bSZezGamA== From: Jonatan Schlag To: network@lists.ipfire.org Subject: [PATCH] Fix network reset Date: Sat, 30 Jun 2018 17:53:48 +0200 Message-Id: <20180630155348.5404-1-jonatan.schlag@ipfire.org> X-Mailer: git-send-email 2.11.0 Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=jschlag smtp.mailfrom=jonatan.schlag@ipfire.org X-Spamd-Result: default: False [-4.95 / 11.00]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MIME_GOOD(-0.10)[text/plain]; TO_DN_SOME(0.00)[]; NEURAL_HAM(-2.85)[-0.951,0]; FROM_HAS_DN(0.00)[]; BAYES_HAM(-3.00)[100.00%]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_CONTAINS_FROM(1.00)[]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[]; ASN(0.00)[asn:34953, ipnet:46.183.96.0/21, country:DE]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_ZERO(0.00)[0] X-Spam-Status: No, score=-4.95 X-Rspamd-Server: mail01.i.ipfire.org X-BeenThere: network@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List for the network package List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: network-bounces@lists.ipfire.org Sender: "network" The functions zone_destroy and zone_destroy_now where merged to zone_destroy in an earlier commit. So we have to use zone_destroy here. Signed-off-by: Jonatan Schlag --- src/network | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network b/src/network index 9a2d480..b28ecdb 100644 --- a/src/network +++ b/src/network @@ -1170,7 +1170,7 @@ cli_reset() { local zone for zone in $(zones_get --all); do - zone_destroy_now "${zone}" + zone_destroy "${zone}" done local port