From 7f569542a2ef8dbc4549f12cf4f5aef6228c7ac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20J=C3=A4ger?=
 <26868917+bastianhjaeger@users.noreply.github.com>
Date: Sat, 31 May 2025 21:55:10 +0200
Subject: [PATCH] feat: allow PX4_UXRCE_DDS_NS override with empty sting
 (#24921)

---
 ROMFS/px4fmu_common/init.d-posix/rcS | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/ROMFS/px4fmu_common/init.d-posix/rcS b/ROMFS/px4fmu_common/init.d-posix/rcS
index 3619e17d03..e40647b9b4 100644
--- a/ROMFS/px4fmu_common/init.d-posix/rcS
+++ b/ROMFS/px4fmu_common/init.d-posix/rcS
@@ -295,10 +295,15 @@ then
 	# for multi intances setup, add namespace prefix
 	uxrce_dds_ns="-n px4_$px4_instance"
 fi
-if [ -n "$PX4_UXRCE_DDS_NS" ]
-then
-	# Override namespace if environment variable is defined
-	uxrce_dds_ns="-n $PX4_UXRCE_DDS_NS"
+if [ "${PX4_UXRCE_DDS_NS+x}" ]; then
+	# Override, as variable is set (empty or not)
+	if [ -n "$PX4_UXRCE_DDS_NS" ]; then
+		# Override namespace if environment variable is non-empty
+		uxrce_dds_ns="-n $PX4_UXRCE_DDS_NS"
+	else
+		# Clear namespace if variable is empty
+		uxrce_dds_ns=""
+	fi
 fi
 if [ -n "$ROS_DOMAIN_ID" ]
 then