From 74e89b4f4904b418882cb3dd9ef2c0bd360d8713 Mon Sep 17 00:00:00 2001
From: "flowzone-app[bot]"
 <124931076+flowzone-app[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 17:11:32 +0000
Subject: [PATCH] v5.2.1

---
 .versionbot/CHANGELOG.yml                     | 28 +++++++++++++++++++
 CHANGELOG.md                                  |  5 ++++
 .../conf/distro/include/balena-os.inc         |  2 +-
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
index 5cfffe544a..fba45e07ca 100644
--- a/.versionbot/CHANGELOG.yml
+++ b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,31 @@
+- commits:
+    - subject: "networkmanager: Wait for iptables lock in shared dispatcher script"
+      hash: 374c4c32df59cc00e0b04d0c619f6fb98a69f1a5
+      body: |
+        The dispatcher script that moves around FORWARD rules of shared
+        interfaces currently calls iptables assuming it will always work
+        but in practice two iptables commands can not run in parallel
+        and we have occasionally seen the script fail with:
+
+        Another app is currently holding the xtables lock.
+        Perhaps you want to use the -w option?
+
+        This patch adds the -w option to make the script wait for the lock
+        when necessary.
+
+        It also makes the script exit with an error code if anything fails,
+        which will log the output as WARN instead of INFO as the errors
+        are easy to overlook at this moment.
+      footer:
+        Change-type: patch
+        change-type: patch
+        Signed-off-by: Michal Toman <michalt@balena.io>
+        signed-off-by: Michal Toman <michalt@balena.io>
+      author: Michal Toman
+      nested: []
+  version: 5.2.1
+  title: ""
+  date: 2024-03-18T17:11:28.023Z
 - commits:
     - subject: Update NetworkManager to version 1.46.0
       hash: 9d88a4566b7a9afc7226df97b40d266f0ece64b6
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2222687e1..bdf0de2f59 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Change log
 -----------
 
+# v5.2.1
+## (2024-03-18)
+
+* networkmanager: Wait for iptables lock in shared dispatcher script [Michal Toman]
+
 # v5.2.0
 ## (2024-03-16)
 
diff --git a/meta-balena-common/conf/distro/include/balena-os.inc b/meta-balena-common/conf/distro/include/balena-os.inc
index 6205e377d3..fafa7cdb00 100644
--- a/meta-balena-common/conf/distro/include/balena-os.inc
+++ b/meta-balena-common/conf/distro/include/balena-os.inc
@@ -5,7 +5,7 @@ include conf/distro/include/balena-os-rust-version.inc
 
 DISTRO = "balena-os"
 DISTRO_NAME = "balenaOS"
-DISTRO_VERSION = "5.2.0"
+DISTRO_VERSION = "5.2.1"
 HOSTOS_VERSION = "${DISTRO_VERSION}"
 python () {
     ''' Set HOSTOS_VERSION from board VERSION if available '''