Fix network reset

Message ID 20180630155348.5404-1-jonatan.schlag@ipfire.org
State Accepted
Commit 36e1f715558455dfdc6041ca235e9af101d471eb
Headers
Series Fix network reset |

Commit Message

Jonatan Schlag July 1, 2018, 1:53 a.m. UTC
  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 <jonatan.schlag@ipfire.org>
---
 src/network | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Michael Tremer July 1, 2018, 3:13 a.m. UTC | #1
Thanks. Merged.

On Sat, 2018-06-30 at 17:53 +0200, Jonatan Schlag wrote:
> 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 <jonatan.schlag@ipfire.org>
> ---
>  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
  

Patch

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