From 3186c0392e45fcf8471246f250b45f61a4664544 Mon Sep 17 00:00:00 2001
From: rwarier <84991591+rwarier@users.noreply.github.com>
Date: Thu, 6 Aug 2026 08:14:46 -0500
Subject: [PATCH 1/4] RDKEMW-23121: Use vendor functions if available

Modified to use device specific overrides. Xi6 devices fetch getEstbMacAddress differently
---
 lib/rdk/utils.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/rdk/utils.sh b/lib/rdk/utils.sh
index f46545f7..2152e790 100755
--- a/lib/rdk/utils.sh
+++ b/lib/rdk/utils.sh
@@ -282,3 +282,9 @@ getPrivacyControlMode()
     #Implement own logic to get the privicyMode settings
     return
 }
+
+# use device specific functions, if available
+# eg: getEstbMacAddress has device specific implementations
+if [ -f /lib/rdk/utils-vendor.sh ]; then
+    . $RDK_PATH/utils-vendor.sh
+fi

From 07004228e92e44cc95a0364755d08e98696b0cfc Mon Sep 17 00:00:00 2001
From: rwarier <84991591+rwarier@users.noreply.github.com>
Date: Thu, 6 Aug 2026 08:19:44 -0500
Subject: [PATCH 2/4] RDKEMW-23121: Use vendor functions if available

---
 lib/rdk/utils.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/rdk/utils.sh b/lib/rdk/utils.sh
index 2152e790..e9d9cc4c 100755
--- a/lib/rdk/utils.sh
+++ b/lib/rdk/utils.sh
@@ -285,6 +285,6 @@ getPrivacyControlMode()
 
 # use device specific functions, if available
 # eg: getEstbMacAddress has device specific implementations
-if [ -f /lib/rdk/utils-vendor.sh ]; then
+if [ -f $RDK_PATH/utils-vendor.sh ]; then
     . $RDK_PATH/utils-vendor.sh
 fi

From 198dbe9edf076889b1ad1f3fc0127ceb2ab7bdbc Mon Sep 17 00:00:00 2001
From: rwarier <84991591+rwarier@users.noreply.github.com>
Date: Thu, 6 Aug 2026 08:35:36 -0500
Subject: [PATCH 3/4] RDKEMW-23121: moved the override to utils.sh

---
 lib/rdk/getDeviceDetails.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/rdk/getDeviceDetails.sh b/lib/rdk/getDeviceDetails.sh
index b7899312..ef9ff622 100755
--- a/lib/rdk/getDeviceDetails.sh
+++ b/lib/rdk/getDeviceDetails.sh
@@ -45,9 +45,6 @@ logMsg "enter"
 . /etc/include.properties
 . /etc/device.properties
 . $RDK_PATH/utils.sh
-if [ -f /lib/rdk/utils-vendor.sh ]; then
-    . $RDK_PATH/utils-vendor.sh
-fi
 
 
 if [ "$DEVICE_TYPE" != "mediaclient" ]; then

From 3e1c0082252394cdf212903c5fcad09257a41b80 Mon Sep 17 00:00:00 2001
From: rwarier <84991591+rwarier@users.noreply.github.com>
Date: Fri, 7 Aug 2026 12:49:37 -0500
Subject: [PATCH 4/4] Update utils.sh

---
 lib/rdk/utils.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lib/rdk/utils.sh b/lib/rdk/utils.sh
index e9d9cc4c..f46545f7 100755
--- a/lib/rdk/utils.sh
+++ b/lib/rdk/utils.sh
@@ -282,9 +282,3 @@ getPrivacyControlMode()
     #Implement own logic to get the privicyMode settings
     return
 }
-
-# use device specific functions, if available
-# eg: getEstbMacAddress has device specific implementations
-if [ -f $RDK_PATH/utils-vendor.sh ]; then
-    . $RDK_PATH/utils-vendor.sh
-fi