From 477bcf8a89128df43feca7e201bb4a5aac0e4dae Mon Sep 17 00:00:00 2001
From: "flowzone-app[bot]"
 <124931076+flowzone-app[bot]@users.noreply.github.com>
Date: Fri, 19 Jul 2024 16:09:51 +0000
Subject: [PATCH] v6.0.1

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

diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
index 4d193a8829..9bd87148a4 100644
--- a/.versionbot/CHANGELOG.yml
+++ b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,21 @@
+- commits:
+    - subject: "NetworkManager: remove duplicate rules in shared dispatcher script"
+      hash: 90093d5d780bb236e21add3a55f270c08623768a
+      body: |
+        Sometimes on NetworkManager restart a new rule for a shared interface
+        is added, but the old rule is not cleaned up properly, so the rules
+        are just piling up. This patch makes the shared dispatcher script
+        clean up duplicates if it finds any.
+      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: 6.0.1
+  title: ""
+  date: 2024-07-19T16:09:46.427Z
 - commits:
     - subject: "common: remove module compression bbclass"
       hash: fbb35d54e5833db8a05b37e6cbce4bf1ca6ec1b7
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b989dace85..8f1e976b5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Change log
 -----------
 
+# v6.0.1
+## (2024-07-19)
+
+* NetworkManager: remove duplicate rules in shared dispatcher script [Michal Toman]
+
 # v6.0.0
 ## (2024-07-19)
 
diff --git a/meta-balena-common/conf/distro/include/balena-os.inc b/meta-balena-common/conf/distro/include/balena-os.inc
index a04a267a49..c4541f4f0e 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 = "6.0.0"
+DISTRO_VERSION = "6.0.1"
 HOSTOS_VERSION = "${DISTRO_VERSION}"
 python () {
     ''' Set HOSTOS_VERSION from board VERSION if available '''