From 31286c7cc4d6103dbd93963d57ba1848f247c127 Mon Sep 17 00:00:00 2001
From: Joe Kurokawa <joekurok@amazon.com>
Date: Wed, 2 Sep 2026 19:10:54 +0000
Subject: [PATCH] Handling of interface renaming by kernel.

---
 bin/setup-policy-routes.sh                    | 14 +++++++++--
 .../patches/update-networkd-priorities.patch  | 25 ++++++++++++-------
 systemd/system/policy-routes@.service         |  1 +
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/bin/setup-policy-routes.sh b/bin/setup-policy-routes.sh
index 23f7d98..5c4be18 100755
--- a/bin/setup-policy-routes.sh
+++ b/bin/setup-policy-routes.sh
@@ -70,12 +70,22 @@ start)
     do_setup
     ;;
 remove)
-    register_networkd_reloader
+    # Clean up stale 70-<iface>.network config left behind when an ENI
+    # renames on re-attach (ens6 -> ens7, amazon-ec2-net-utils#166).
+    # Do not networkd reload/reconfigure here: the link is already gone by
+    # the time this runs, and a global reload would reset conntrack for
+    # unrelated interfaces (the regression fixed in: 
+    # https://github.com/amazonlinux/amazon-ec2-net-utils/pull/107/changes/c35c4d504fea196af3aa4a00c84b17fa54657d9e).
+    # In addtion, this code also runs during upgrade, only run this when sysfs node is not present.
+    # This means that it's an actual detach rather than a restart.
+    if [ -e "/sys/class/net/${iface}" ]; then
+        debug "Link ${iface} still present, skipping configuration removal."
+        exit 0
+    fi
     debug "Removing configuration for $iface."
     rm -rf "/run/network/$iface" \
        "${unitdir}/70-${iface}.network" \
        "${unitdir}/70-${iface}.network.d" || true
-    touch "$reload_flag"
     ;;
 stop|cleanup)
     # this is a no-op, only supported for compatibility
diff --git a/debian/patches/update-networkd-priorities.patch b/debian/patches/update-networkd-priorities.patch
index 543b8ab..9fb76fa 100644
--- a/debian/patches/update-networkd-priorities.patch
+++ b/debian/patches/update-networkd-priorities.patch
@@ -1,29 +1,38 @@
-From 162c8b20ab93ae22fa0c22816d4fd25ff005221b Mon Sep 17 00:00:00 2001
+From a47a84f257b588beef06ee04352f02e9deeb856e Mon Sep 17 00:00:00 2001
 From: Joe Kurokawa <joekurok@amazon.com>
 Date: Wed, 3 Sep 2025 01:39:29 +0000
 Subject: [PATCH] change the priority of the networkd configs
 
 ensure they're order before netplan
 ---
- bin/setup-policy-routes.sh | 4 ++--
+ bin/setup-policy-routes.sh | 6 +++---
  lib/lib.sh                 | 6 +++---
- 2 files changed, 5 insertions(+), 5 deletions(-)
+ 2 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/bin/setup-policy-routes.sh b/bin/setup-policy-routes.sh
-index 23f7d98..f89d827 100755
+index 5c4be18..4beefff 100755
 --- a/bin/setup-policy-routes.sh
 +++ b/bin/setup-policy-routes.sh
-@@ -73,8 +73,8 @@ remove)
-     register_networkd_reloader
+@@ -70,7 +70,7 @@ start)
+     do_setup
+     ;;
+ remove)
+-    # Clean up stale 70-<iface>.network config left behind when an ENI
++    # Clean up stale 07-<iface>.network config left behind when an ENI
+     # renames on re-attach (ens6 -> ens7, amazon-ec2-net-utils#166).
+     # Do not networkd reload/reconfigure here: the link is already gone by
+     # the time this runs, and a global reload would reset conntrack for
+@@ -84,8 +84,8 @@ remove)
+     fi
      debug "Removing configuration for $iface."
      rm -rf "/run/network/$iface" \
 -       "${unitdir}/70-${iface}.network" \
 -       "${unitdir}/70-${iface}.network.d" || true
 +       "${unitdir}/07-${iface}.network" \
 +       "${unitdir}/07-${iface}.network.d" || true
-     touch "$reload_flag"
      ;;
  stop|cleanup)
+     # this is a no-op, only supported for compatibility
 diff --git a/lib/lib.sh b/lib/lib.sh
 index a794ca0..603c522 100644
 --- a/lib/lib.sh
@@ -55,5 +64,3 @@ index a794ca0..603c522 100644
      if [ -e "$cfgfile" ] &&
             [ ! -v EC2_IF_INITIAL_SETUP ]; then
          echo $retval
--- 
-2.47.3
diff --git a/systemd/system/policy-routes@.service b/systemd/system/policy-routes@.service
index fe3ff31..61719ee 100644
--- a/systemd/system/policy-routes@.service
+++ b/systemd/system/policy-routes@.service
@@ -16,6 +16,7 @@ AmbientCapabilities=CAP_NET_ADMIN
 NoNewPrivileges=yes
 User=root
 ExecStart=/usr/bin/setup-policy-routes %i start
+ExecStop=/usr/bin/setup-policy-routes %i remove
 Restart=on-failure
 RestartSec=1
 RestartPreventExitStatus=2