From 33a4e65f69ee139b4c768638ff3dab1824c1d616 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Fri, 14 May 2021 18:56:38 +0200
Subject: [PATCH] nixos-module/container/upstream: catch failures

---
 nix/nixos-module/container/upstream.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nix/nixos-module/container/upstream.nix b/nix/nixos-module/container/upstream.nix
index 322cb53..ccf05b7 100644
--- a/nix/nixos-module/container/upstream.nix
+++ b/nix/nixos-module/container/upstream.nix
@@ -53,7 +53,8 @@ in
     extraCommands =
       builtins.concatStringsSep "\n" (
         map (net: ''
-          ip6tables -t nat -N ${net}_nat
+          ip6tables -t nat -N ${net}_nat || \
+            ip6tables -t nat -F ${net}_nat
           ${builtins.concatStringsSep "\n" (
             map (subnet: ''
               ip6tables -t nat -A ${net}_nat \
@@ -71,8 +72,9 @@ in
     extraStopCommands =
       builtins.concatStringsSep "\n" (
         map (net: ''
-          ip6tables -t nat -F POSTROUTING
-          ip6tables -t nat -X ${net}_nat
+          ip6tables -t nat -F POSTROUTING 2>/dev/null || true
+          ip6tables -t nat -F ${net}_nat 2>/dev/null || true
+          ip6tables -t nat -X ${net}_nat 2>/dev/null || true
         '') (builtins.attrNames upstreamInterfaces)
       );
     inherit (hostConf) forwardPorts;