Rebase

CHANGELOG.md

@@ -4,14 +4,45 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+<<<<<<< HEAD
 #### [6.0.1](https://github.com/rdkcentral/sysint/compare/6.0.0...6.0.1)
 
+=======
+#### [4.2.1v17](https://github.com/rdkcentral/sysint/compare/6.0.1...4.2.1v17)
+
+- RDKEMW-21582: Network connection recovery script should handle IPv4-only/IPv6-only networks [`#581`](https://github.com/rdkcentral/sysint/pull/581)
+- RDKEMW-19100:gst-cleanup conditions when cdl_flashed_file_name is not present [`#551`](https://github.com/rdkcentral/sysint/pull/551)
+- RDKEMW-18972 :  RebootReason log adds colon in the Parodus.log file [`#550`](https://github.com/rdkcentral/sysint/pull/550)
+- RDKEMW-16152: "Let's get connected" screen displayed during Migration testing [`#549`](https://github.com/rdkcentral/sysint/pull/549)
+- RDKEMW-18793a: avoid thermal call in deepsleep [`#548`](https://github.com/rdkcentral/sysint/pull/548)
+- RDKEMW-17533 : [support/8.4.4.0] OCDM_WVMediaKey and OCDM_SaThread changes in sysint [`#518`](https://github.com/rdkcentral/sysint/pull/518)
+- RDKEMW-17274: 8.4 T2 event for MemAvailable Need To Send Only Numerical Value [`#515`](https://github.com/rdkcentral/sysint/pull/515)
+- RDKEMW-15318: [4.2.1] stop ctrlm-main service before bluez for graceful reboot [`#486`](https://github.com/rdkcentral/sysint/pull/486)
+- [RDKEMW-14555] : Updating wifi reassociation threshould tolerance RFC [`#462`](https://github.com/rdkcentral/sysint/pull/462)
+- Hotfix 4.2.1v8 [`#475`](https://github.com/rdkcentral/sysint/pull/475)
+- RDKEMW-13932: Move Bluetooth Mac update from Device Details to Bluetooth Service [`#458`](https://github.com/rdkcentral/sysint/pull/458)
+-  RDKEMW-13691: Increase Timeout for NTP PartnerURL Read  [`#456`](https://github.com/rdkcentral/sysint/pull/456)
+- RDKEMW-13425: Remove monarch process name for core upload [`#452`](https://github.com/rdkcentral/sysint/pull/452)
+- RDKEMW-13061: Include utility indepenent of T2 for telemetry upload [`#443`](https://github.com/rdkcentral/sysint/pull/443)
+- sysint 4.2.1 hotfix release [`35cd500`](https://github.com/rdkcentral/sysint/commit/35cd5003a10a61c13830955014d04822d952f104)
+- Sysint 4.2.1 hotfix release [`c542d88`](https://github.com/rdkcentral/sysint/commit/c542d88c469198d0d7c5b55503635a88697beaa3)
+- Sysint 4.2.1v13 hotfix release [`27c5acd`](https://github.com/rdkcentral/sysint/commit/27c5acd0f90ce3cacb99383139d441289f56526f)
+
+#### [6.0.1](https://github.com/rdkcentral/sysint/compare/6.0.0...6.0.1)
+
+> 20 July 2026
+
+>>>>>>> 4.2.1v17
 - RDKE-1065: Automated workflow - create pull request to main instead of develop [`#572`](https://github.com/rdkcentral/sysint/pull/572)
 - RDKEMW-20916 : [RDKE] [Develop] RDKV-to-RDKE Migration: Unexpected Network Connectivity Prior to Migration Completion [`#571`](https://github.com/rdkcentral/sysint/pull/571)
 - RDKEMW-10439: Reboot device with WareHouse plugin resetDevice [`#381`](https://github.com/rdkcentral/sysint/pull/381)
 - RDKEMW-21159: avoid thermal call in deepsleep (#548) [`#566`](https://github.com/rdkcentral/sysint/pull/566)
 - RDKE-1065: Automated Component release workflow [`#562`](https://github.com/rdkcentral/sysint/pull/562)
 - RDKE-1065: Using ubuntu-latest runner for release workflow [`#557`](https://github.com/rdkcentral/sysint/pull/557)
+<<<<<<< HEAD
+=======
+- 6.0.1 release changelog updates [`658364b`](https://github.com/rdkcentral/sysint/commit/658364b56e7ee794ff8f53b1fa88106a6e8ae007)
+>>>>>>> 4.2.1v17
 - Merge tag '6.0.0' into develop [`e96c345`](https://github.com/rdkcentral/sysint/commit/e96c34560bc16714dec958463ebf64772902f45d)
 
 ### [6.0.0](https://github.com/rdkcentral/sysint/compare/5.1.0...6.0.0)

lib/rdk/backup_logs.sh

@@ -0,0 +1,165 @@
+#!/bin/sh
+##############################################################################
+# If not stated otherwise in this file or this component's LICENSE file the
+# following copyright and licenses apply:
+#
+# Copyright 2020 RDK Management
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Purpose: This script is used to backup the Logs
+# Scope: RDK devices
+# Usage: This script is triggered by systemd service 
+##############################################################################
+
+. /etc/include.properties
+. /etc/device.properties
+
+if [ -f /etc/env_setup.sh ]; then
+    . /etc/env_setup.sh
+fi
+
+PREV_LOG_PATH="$LOG_PATH/PreviousLogs"
+PREV_LOG_BACKUP_PATH="$LOG_PATH/PreviousLogs_backup"
+
+backupLog() {
+    timestamp=$(/bin/timestamp)
+    echo "$timestamp $0: $*"
+}
+
+# create log workspace if not there
+if [ ! -d "$LOG_PATH" ];then 
+    mkdir -p "$LOG_PATH"
+fi
+
+# create intermediate log workspace if not there
+if [ ! -d $PREV_LOG_PATH ];then
+    mkdir -p $PREV_LOG_PATH
+fi
+
+# create log backup workspace if not there
+if [ ! -d $PREV_LOG_BACKUP_PATH ];then
+    mkdir -p $PREV_LOG_BACKUP_PATH
+else
+    rm  -rf $PREV_LOG_BACKUP_PATH/*
+fi
+
+if [ $APP_PERSISTENT_PATH ];then 
+    PERSISTENT_PATH=$APP_PERSISTENT_PATH
+else
+    PERSISTENT_PATH=/opt/persistent
+fi
+
+touch $PERSISTENT_PATH/logFileBackup
+
+# disk size check for recovery if /opt size > 90%
+if  [ -f /lib/rdk/disk_threshold_check.sh ];then
+    sh /lib/rdk/disk_threshold_check.sh 0
+fi
+
+backupAndRecoverLogs()
+{
+    source=$1
+    destn=$2
+    operation=$3
+    s_extn=$4
+    d_extn=$5
+
+    backupLog "backupAndRecoverLogs:start source=$source, destn=$destn, operation=$operation"
+
+    for file in $(find $source -mindepth 1 -maxdepth 1 -type f -name "$s_extn*");
+    do
+        $operation "$file" "$destn$d_extn${file/$source$s_extn/}"
+    done
+    backupLog "backupAndRecoverLogs:end"
+}
+
+last_bootfile=$(find "$PREV_LOG_PATH" -name last_reboot)
+if [ -f "$last_bootfile" ];then
+    rm -rf "$last_bootfile"
+fi
+
+sysLog="messages.txt"
+sysLogBAK1="bak1_messages.txt"
+sysLogBAK2="bak2_messages.txt"
+sysLogBAK3="bak3_messages.txt"
+
+if [ "$HDD_ENABLED" = "false" ]; then
+    backupLog "HDD disabled device"
+    BAK1="bak1_"
+    BAK2="bak2_"
+    BAK3="bak3_"
+    if [ ! -f "$PREV_LOG_PATH/$sysLog" ]; then
+            find $LOG_PATH -maxdepth 1 -mindepth 1 \( -type l -o -type f \) \( -iname "*.txt*" -o -iname "*.log*" -o -iname "*.bin*" -o -name "bootlog" \) -exec mv '{}' $PREV_LOG_PATH \; 
+            if [ $? -ne 0 ]; then
+                backupLog "Error:Failed to Move the logs from  $LOG_PATH to $PREV_LOG_PATH"
+            fi
+    elif [ ! -f "$PREV_LOG_PATH/$sysLogBAK1" ]; then
+        # box reboot within 8 minutes after reboot
+        backupAndRecoverLogs "$LOG_PATH/" "$PREV_LOG_PATH/" mv "" $BAK1
+    elif [ ! -f "$PREV_LOG_PATH/$sysLogBAK2" ]; then
+        # box reboot within 8 minutes after reboot
+        backupAndRecoverLogs "$LOG_PATH/" "$PREV_LOG_PATH/" mv "" $BAK2
+    elif [ ! -f "$PREV_LOG_PATH/$sysLogBAK3" ]; then
+        # box reboot within 8 minutes after reboot
+        backupAndRecoverLogs "$LOG_PATH/" "$PREV_LOG_PATH/" mv "" $BAK3
+    else
+        # box reboot within 8 minutes after reboot
+        backupAndRecoverLogs "$PREV_LOG_PATH/" "$PREV_LOG_PATH/" mv "$BAK1" ""
+        backupAndRecoverLogs "$PREV_LOG_PATH/" "$PREV_LOG_PATH/" mv "$BAK2" "$BAK1"
+        backupAndRecoverLogs "$PREV_LOG_PATH/" "$PREV_LOG_PATH/" mv "$BAK3" "$BAK2"
+        backupAndRecoverLogs "$LOG_PATH/" "$PREV_LOG_PATH/" mv "" "$BAK3"
+    fi
+
+   /bin/touch "$PREV_LOG_PATH/last_reboot"
+
+    # logs cleanup after backup
+    backupLog "Clean up $LOG_PATH"
+    rm -rf $LOG_PATH/*.*
+    find $LOG_PATH -name "*-*-*-*-*M-" -exec rm -rf {} \;
+else
+    backupLog "HDD enabled device"
+    if [ ! -f "$PREV_LOG_PATH/$sysLog" ]; then
+       backupLog "Move logs from $LOG_PATH to $PREV_LOG_PATH"
+       find $LOG_PATH -maxdepth 1 -mindepth 1 \( -type l -o -type f \) \( -iname "*.txt*" -o -iname "*.log*" -o -name "bootlog" \) -exec mv '{}' $PREV_LOG_PATH \;
+       /bin/touch $PREV_LOG_PATH/last_reboot
+    else
+       find "$PREV_LOG_PATH" -name last_reboot | xargs rm >/dev/null
+       timestamp=$(date "+%m-%d-%y-%I-%M-%S%p")
+       LogFilePathPerm="$PREV_LOG_PATH/logbackup-$timestamp"
+       mkdir -p "$LogFilePathPerm"
+       backupLog "Move logs from $LOG_PATH to $LogFilePathPerm"
+       find "$LOG_PATH" -maxdepth 1 -mindepth 1 \( -type l -o -type f \) \( -iname "*.txt*" -o -iname "*.log*" -o -name "bootlog" \)  -exec mv '{}' "$LogFilePathPerm" \;
+       /bin/touch "$LogFilePathPerm/last_reboot"
+    fi
+fi
+
+if [ -f /tmp/disk_cleanup.log ];then
+    mv /tmp/disk_cleanup.log "$LOG_PATH"
+fi
+
+if [ -f /tmp/mount_log.txt ];then
+    mv /tmp/mount_log.txt "$LOG_PATH"
+fi
+
+if [ -f /tmp/mount-ta_log.txt ];then
+    mv /tmp/mount-ta_log.txt "$LOG_PATH"
+fi
+
+cp /version.txt "$LOG_PATH"
+cp /etc/skyversion.txt "${LOG_PATH}/skyversion.txt"
+cp /etc/rippleversion.txt "${LOG_PATH}/rippleversion.txt"
+
+backupLog "Send systemd notification ..."
+/bin/systemd-notify --ready --status="Logs Backup Done..!"
+

lib/rdk/core_shell.sh

@@ -335,7 +335,11 @@ if  [ "$1" = "xcal-discovery-" ] || [ "$1" = "xdiscovery" ] || [ "$1" = "IARMDae
     [ "$1" = "NWMgrPlugin" ] || [ "$1" = "nm_event_thrd" ] ||
     [ "$1" = "Monitor::IResou" ] || [ "$1" = "DRMSYSTEM" ] || [ "$1" = "HTTPREQUEST_MAN" ] ||
     [ "$1" = "civetweb-worker" ] || [ "$1" = "nfrtool" ] ||
+<<<<<<< HEAD
     [ "$1" = "OCDM_WVMediaKey" ] || [ "$1" = "OCDM_SaThread" ] || [ "$1" = "multiqueue28:sr" ]; then
+=======
+    [ "$1" = "OCDM_WVMediaKey" ] || [ "$1" = "OCDM_SaThread" ]; then
+>>>>>>> 4.2.1v17
         dumpFile
         exit 0
 fi

lib/rdk/getDeviceDetails.sh

@@ -285,7 +285,11 @@ getBluetoothMac()
     if [ -f /lib/rdk/readBTAddress-vendor.sh ]; then
         bluetooth_mac=`sh /lib/rdk/readBTAddress-vendor.sh`
     else
+<<<<<<< HEAD
         bluetooth_mac=`sh /lib/rdk/readBTAddress-generic.sh`
+=======
+        bluetooth_mac=`sh /lib/rdk/readBTAddress-generic.sh`    
+>>>>>>> 4.2.1v17
     fi
 
     echo "$bluetooth_mac"