Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
16d826b
SERXIONE-8331 : Added viper_ipa to exceptions for /media/apps/sky/pa…
naveenkumarhanasi Jan 16, 2026
7394e84
Sysint 4.2.1 hotfix release
naveenkumarhanasi Jan 16, 2026
473d99f
Merge branch 'hotfix/4.2.1v1' into support/4.2.1
naveenkumarhanasi Jan 16, 2026
0b7a028
RDKEVD-5412: ES1 RTK Release 1.5.0
Jan 23, 2026
fbb7a3e
Merge branch 'feature/RDKEVD-5412' into develop
nhanasi Jan 27, 2026
7b085a2
Create readBTAddress-generic.sh
nhanasi Jan 23, 2026
be909e8
Update getDeviceDetails.sh
nhanasi Jan 23, 2026
1bebeb8
Update lib/rdk/getDeviceDetails.sh
nhanasi Jan 23, 2026
668eeca
Update readBTAddress-generic.sh
nhanasi Jan 23, 2026
7e605fd
Update getDeviceDetails.sh
nhanasi Jan 23, 2026
fac7dfc
Update readBTAddress-generic.sh
nhanasi Jan 23, 2026
1be51ef
Update getDeviceDetails.sh
nhanasi Jan 23, 2026
27f8e41
Update getDeviceDetails.sh
nhanasi Jan 23, 2026
f8b2432
Update readBTAddress-generic.sh
nhanasi Jan 23, 2026
73181a5
RDK-59964 : ZeroConfig (IPv4LL) support for EntOS - AirPlay Devices (…
gururaajar Jan 30, 2026
e455a80
Sysint 4.2.3 release changelog updates
naveenkumarhanasi Jan 30, 2026
2a428f5
Sysint 4.2.3 release changelog updates (#437)
nhanasi Jan 30, 2026
138be84
RDK-59964: Sysint 4.2.3 release (#438)
nhanasi Jan 30, 2026
c9c32a2
Merge branch 'release/4.2.3'
naveenkumarhanasi Jan 30, 2026
07c7aab
Merge tag '4.2.3' into develop
naveenkumarhanasi Jan 30, 2026
84339f4
XIONE-18284: Need to add monarch process name for core upload (#441)
nhanasi Feb 3, 2026
d1b176a
RDKEMW-13059: Include utility indepenent of T2 for telemetry upload (…
shibu-kv Feb 3, 2026
a232c32
4.3.0 release changelog updates
tdeva14 Feb 6, 2026
488750c
Merge branch 'release/4.3.0'
tdeva14 Feb 6, 2026
8fcdc31
Merge tag '4.3.0' into develop
tdeva14 Feb 6, 2026
d52473a
Revert "XIONE-18284: Need to add monarch process name for core upload…
nhanasi Feb 9, 2026
4022281
RDKEMW-13687: Increase Timeout for NTP PartnerURL Read (#450)
sindhu-krishnan Feb 11, 2026
76bf8f0
4.3.1 release changelog updates
tdeva14 Feb 11, 2026
4a29ec2
Merge branch 'release/4.3.1'
tdeva14 Feb 11, 2026
354b182
Merge tag '4.3.1' into develop
tdeva14 Feb 11, 2026
999928c
Disable password authentication (#427)
NareshM1702 Feb 25, 2026
2d7ca69
<Sysint 4.3.2 release changelog updates
nhanasi Feb 26, 2026
c21ba73
Sysint 4.3.2 release changelog updates (#463)
nhanasi Feb 26, 2026
d0cbe87
RDKEMW-12868: Sysint 4.3.2 release changelog updates (#464)
nhanasi Feb 26, 2026
db73c8d
Merge branch 'release/4.3.2'
nhanasi Feb 26, 2026
ce34886
Merge tag '4.3.2' into develop
nhanasi Feb 26, 2026
13e79f9
RDK-59974 : Migrate rebootNow script to C - Implementation (#459)
Saranya2421 Feb 27, 2026
f085b1d
4.4.0 release changelog updates
tdeva14 Feb 27, 2026
ebcf851
Merge branch 'release/4.4.0'
tdeva14 Feb 27, 2026
92173b4
Merge tag '4.4.0' into develop
tdeva14 Feb 27, 2026
7598c95
RDKEMW-14726 - Implement Chrony runtime selection for Time Sync (#469)
sindhu-krishnan Mar 10, 2026
ded2a59
4.5.0 release changelog updates
tdeva14 Mar 10, 2026
f9bec1c
Merge branch 'release/4.5.0'
tdeva14 Mar 10, 2026
aebdac3
Merge tag '4.5.0' into develop
tdeva14 Mar 10, 2026
2dc0d67
RDKEMW-9393 : Dropbear is using prod Key to connect to devices runnin…
KTirumalaSrihari Mar 11, 2026
6596c78
4.5.1 release changelog updates
tdeva14 Mar 11, 2026
8668de9
Merge branch 'release/4.5.1'
tdeva14 Mar 11, 2026
b94cde6
Merge tag '4.5.1' into develop
tdeva14 Mar 11, 2026
6a71c71
SERXIONE-8445:PREVIOUS_LOG event observed false reporting telemetry i…
dharshini555 Mar 11, 2026
ad07789
Update 10-unmanaged-devices for unmanaging wl0.2
aminaseyyad Mar 13, 2026
5dd81f9
[RDKEMW-14881] Updating wifi reassociation threshould tolerance RFC …
udaykrishnag Mar 13, 2026
94f6e42
Sysint 4.5.2 release changelog updates
naveenkumarhanasi Mar 13, 2026
029809e
Sysint 4.5.2 release changelog updates (#484)
nhanasi Mar 13, 2026
cfc061b
Sysint 4.5.2 release changelog updates (#483)
nhanasi Mar 13, 2026
0af8bee
Merge branch 'release/4.5.2'
naveenkumarhanasi Mar 13, 2026
e34a943
Merge tag '4.5.2' into develop
naveenkumarhanasi Mar 13, 2026
9b8505a
Merge branch 'develop' into topic/RDKMVE-1740
aminaseyyad Mar 14, 2026
06dc579
Merge pull request #482 from rdkcentral/topic/RDKMVE-1740
AravindanNC Mar 18, 2026
4f77233
Update previous-log-backup.service
Abhinavpv28 Mar 18, 2026
7335293
Update device.properties (#472)
KTirumalaSrihari Mar 19, 2026
57b3c12
Sysint 4.5.3 release changelog updates
naveenkumarhanasi Mar 20, 2026
4b963e5
Merge branch 'release/4.5.3'
naveenkumarhanasi Mar 20, 2026
3bd6471
Merge tag '4.5.3' into develop
naveenkumarhanasi Mar 20, 2026
dee962f
Merge pull request #487 from rdkcentral/develop
Abhinavpv28 Mar 23, 2026
2c94e2e
Script cleanup
Mar 25, 2026
9ea66e2
Remove uploadSTBLogs.sh script reference
Mar 25, 2026
f554628
Merge pull request #488 from rdkcentral/feature/backuplog
Abhinavpv28 Mar 26, 2026
3d2215e
Merge pull request #492 from rdkcentral/develop
Abhinavpv28 Mar 26, 2026
925c788
Delete lib/rdk/uploadSTBLogs.sh
Abhinavpv28 Mar 26, 2026
50d0537
Delete lib/rdk/usbLogUpload.sh
Abhinavpv28 Mar 26, 2026
ade8cc2
Delete lib/rdk/UploadLogsNow.sh
Abhinavpv28 Mar 26, 2026
56c3713
Merge pull request #491 from rdkcentral/feature/script_cleanup
Abhinavpv28 Mar 26, 2026
adf5b1b
Sysint 4.5.4 release changelog updates
naveenkumarhanasi Mar 27, 2026
9307d25
Merge branch 'release/4.5.4'
naveenkumarhanasi Mar 27, 2026
d9f48c0
Merge tag '4.5.4' into develop
naveenkumarhanasi Mar 27, 2026
0f3db13
Delete lib/rdk/backup_logs.sh
Abhinavpv28 Mar 31, 2026
ced3966
Merge pull request #493 from rdkcentral/feature/backup_script_remove
Abhinavpv28 Apr 1, 2026
5c9f548
RDKEMW-16414: Replace type exec in NM_Bootstrap (#494)
AravindanNC Apr 1, 2026
631e4af
RDKEMW-15186 : [RDK-E] [TCHXi6] estb mac address is incorrect (#495)
Abhinavpv28 Apr 2, 2026
124d3bf
Sysint 4.5.5 release changelog updates
naveenkumarhanasi Apr 3, 2026
0f44776
Merge branch 'release/4.5.5'
naveenkumarhanasi Apr 3, 2026
654be5f
Merge tag '4.5.5' into develop
naveenkumarhanasi Apr 3, 2026
bc5e8d8
RDKEMW-15490 : Removing reboot script reference from sysint (#500)
Saranya2421 Apr 9, 2026
711601e
5.0.0 release changelog updates
tdeva14 Apr 9, 2026
9facdd3
Merge branch 'release/5.0.0'
tdeva14 Apr 9, 2026
af56fe3
Merge tag '5.0.0' into develop
tdeva14 Apr 9, 2026
be07e4b
RDKEMW-16664: Send integer value for MemAvailable to t2ValNotify (#496)
Copilot Apr 10, 2026
c31fdaf
RDKEMW-16446: No Wifi screen issue (#498)
AravindanNC Apr 13, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 113 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,125 @@ 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).

#### [5.0.0](https://github.com/rdkcentral/sysint/compare/4.5.5...5.0.0)

- RDKEMW-15490 : Removing reboot script reference from sysint [`#500`](https://github.com/rdkcentral/sysint/pull/500)
- Merge tag '4.5.5' into develop [`654be5f`](https://github.com/rdkcentral/sysint/commit/654be5fcc3473060f765481e5cd9dd4f84f65d95)

#### [4.5.5](https://github.com/rdkcentral/sysint/compare/4.5.4...4.5.5)

> 3 April 2026

- RDKEMW-15186 : [RDK-E] [TCHXi6] estb mac address is incorrect [`#495`](https://github.com/rdkcentral/sysint/pull/495)
- RDKEMW-16414: Replace type exec in NM_Bootstrap [`#494`](https://github.com/rdkcentral/sysint/pull/494)
- RDK-61128 : Remove the Logupload Scripts ported to C [`#493`](https://github.com/rdkcentral/sysint/pull/493)
- Delete lib/rdk/backup_logs.sh [`0f3db13`](https://github.com/rdkcentral/sysint/commit/0f3db13ec096d8fbe33754cb4cbf1a65eda45153)
- Sysint 4.5.5 release changelog updates [`124d3bf`](https://github.com/rdkcentral/sysint/commit/124d3bf73d596c87082721cc8189cf95b8794e4b)
- Merge tag '4.5.4' into develop [`d9f48c0`](https://github.com/rdkcentral/sysint/commit/d9f48c011ab0fe3abbf7144d9674933321f38698)

#### [4.5.4](https://github.com/rdkcentral/sysint/compare/4.5.3...4.5.4)

> 27 March 2026

- RDK-61128 : Remove the Logupload Scripts ported to C [`#491`](https://github.com/rdkcentral/sysint/pull/491)
- Rebase [`#492`](https://github.com/rdkcentral/sysint/pull/492)
- RDK-61009 : [RDKE] Port Log Backup Scripts to Source code [`#488`](https://github.com/rdkcentral/sysint/pull/488)
- Rebase [`#487`](https://github.com/rdkcentral/sysint/pull/487)
- Delete lib/rdk/uploadSTBLogs.sh [`925c788`](https://github.com/rdkcentral/sysint/commit/925c788fa267c0993d427374bfcc385da20e9a1e)
- Delete lib/rdk/UploadLogsNow.sh [`ade8cc2`](https://github.com/rdkcentral/sysint/commit/ade8cc2585d6b10bc549c1ce044ddc90eea08993)
- Delete lib/rdk/usbLogUpload.sh [`50d0537`](https://github.com/rdkcentral/sysint/commit/50d05375ba40940d038489cd75e9e8b053708713)

#### [4.5.3](https://github.com/rdkcentral/sysint/compare/4.5.2...4.5.3)

> 20 March 2026

- Update device.properties [`#472`](https://github.com/rdkcentral/sysint/pull/472)
- Update 10-unmanaged-devices for unmanaging wl0.2 [`#482`](https://github.com/rdkcentral/sysint/pull/482)
- Sysint 4.5.2 release changelog updates [`#483`](https://github.com/rdkcentral/sysint/pull/483)
- Sysint 4.5.3 release changelog updates [`57b3c12`](https://github.com/rdkcentral/sysint/commit/57b3c12fddecd670d090210aa049c1c7967512bf)
- Merge tag '4.5.2' into develop [`e34a943`](https://github.com/rdkcentral/sysint/commit/e34a943c07d6b18e2a87fea5219e4de2068e73db)

#### [4.5.2](https://github.com/rdkcentral/sysint/compare/4.5.1...4.5.2)

> 13 March 2026

- Sysint 4.5.2 release changelog updates [`#484`](https://github.com/rdkcentral/sysint/pull/484)
- [RDKEMW-14881] Updating wifi reassociation threshould tolerance RFC [`#467`](https://github.com/rdkcentral/sysint/pull/467)
- SERXIONE-8445:PREVIOUS_LOG event observed false reporting telemetry in RDK-E R40 [`#474`](https://github.com/rdkcentral/sysint/pull/474)
- Merge tag '4.5.1' into develop [`b94cde6`](https://github.com/rdkcentral/sysint/commit/b94cde623d5549f72bf610ff6340241022c3841d)

#### [4.5.1](https://github.com/rdkcentral/sysint/compare/4.5.0...4.5.1)

> 11 March 2026

- RDKEMW-9393 : Dropbear is using prod Key to connect to devices running with prod build if DeviceType is Test [`#440`](https://github.com/rdkcentral/sysint/pull/440)
- 4.5.1 release changelog updates [`6596c78`](https://github.com/rdkcentral/sysint/commit/6596c784f5be3faa673fe0e829352430f8ba9587)
- Merge tag '4.5.0' into develop [`aebdac3`](https://github.com/rdkcentral/sysint/commit/aebdac39a57c3141032c627dcb07a23a50b811e2)

#### [4.5.0](https://github.com/rdkcentral/sysint/compare/4.4.0...4.5.0)

> 10 March 2026

- RDKEMW-14726 - Implement Chrony runtime selection for Time Sync [`#469`](https://github.com/rdkcentral/sysint/pull/469)
- 4.5.0 release changelog updates [`ded2a59`](https://github.com/rdkcentral/sysint/commit/ded2a599a3fb49bf41a92a0306cb758aa60a2039)
- Merge tag '4.4.0' into develop [`92173b4`](https://github.com/rdkcentral/sysint/commit/92173b430828bb3f31dd7163463876d3b0d8e6dd)

#### [4.4.0](https://github.com/rdkcentral/sysint/compare/4.3.2...4.4.0)

> 27 February 2026

- RDK-59974 : Migrate rebootNow script to C - Implementation [`#459`](https://github.com/rdkcentral/sysint/pull/459)
- Sysint 4.3.2 release changelog updates [`#463`](https://github.com/rdkcentral/sysint/pull/463)
- 4.4.0 release changelog updates [`f085b1d`](https://github.com/rdkcentral/sysint/commit/f085b1d634182199d19c7776a108c78e02e2c8fd)
- Merge tag '4.3.2' into develop [`ce34886`](https://github.com/rdkcentral/sysint/commit/ce348869bf09beb0cb4735436ccd05bc2e38629f)

#### [4.3.2](https://github.com/rdkcentral/sysint/compare/4.3.1...4.3.2)

> 26 February 2026

- RDKEMW-12868: Sysint 4.3.2 release changelog updates [`#464`](https://github.com/rdkcentral/sysint/pull/464)
- Disable password authentication [`#427`](https://github.com/rdkcentral/sysint/pull/427)
- &lt;Sysint 4.3.2 release changelog updates [`2d7ca69`](https://github.com/rdkcentral/sysint/commit/2d7ca695ffc82814b2da9eb360403e2f65360fff)
- Merge tag '4.3.1' into develop [`354b182`](https://github.com/rdkcentral/sysint/commit/354b182478a02c5a943fa4ffce733b55a3069d00)

#### [4.3.1](https://github.com/rdkcentral/sysint/compare/4.3.0...4.3.1)

> 11 February 2026

- RDKEMW-13687: Increase Timeout for NTP PartnerURL Read [`#450`](https://github.com/rdkcentral/sysint/pull/450)
- Revert "XIONE-18284: Need to add monarch process name for core upload (#441)" [`#451`](https://github.com/rdkcentral/sysint/pull/451)
- 4.3.1 release changelog updates [`76bf8f0`](https://github.com/rdkcentral/sysint/commit/76bf8f036a1d992100e7235c3c2d960cee81f2e5)
- Merge tag '4.3.0' into develop [`8fcdc31`](https://github.com/rdkcentral/sysint/commit/8fcdc317b2edc4f6d6cbf52d0cfec81c82660466)

#### [4.3.0](https://github.com/rdkcentral/sysint/compare/4.2.3...4.3.0)

> 6 February 2026

- RDKEMW-13059: Include utility indepenent of T2 for telemetry upload [`#442`](https://github.com/rdkcentral/sysint/pull/442)
- XIONE-18284: Need to add monarch process name for core upload [`#441`](https://github.com/rdkcentral/sysint/pull/441)
- Sysint 4.2.3 release changelog updates [`#437`](https://github.com/rdkcentral/sysint/pull/437)
- 4.3.0 release changelog updates [`a232c32`](https://github.com/rdkcentral/sysint/commit/a232c32f1af89c70ef4a0b9f4fc8da0ca1ef57d5)
- Merge tag '4.2.3' into develop [`07c7aab`](https://github.com/rdkcentral/sysint/commit/07c7aab08b14425f711584a9002c8d1c5d1ad2be)

#### [4.2.3](https://github.com/rdkcentral/sysint/compare/4.2.2...4.2.3)

> 30 January 2026

- RDK-59964: Sysint 4.2.3 release [`#438`](https://github.com/rdkcentral/sysint/pull/438)
- RDK-59964 : ZeroConfig (IPv4LL) support for EntOS - AirPlay Devices [`#431`](https://github.com/rdkcentral/sysint/pull/431)
- Update readBTAddress-generic.sh [`fac7dfc`](https://github.com/rdkcentral/sysint/commit/fac7dfcb86a413388dc243d9811110928fb9b6d1)
- Sysint 4.2.3 release changelog updates [`e455a80`](https://github.com/rdkcentral/sysint/commit/e455a80dc92d3610211678cc79b175bad879c97a)
- Create readBTAddress-generic.sh [`7b085a2`](https://github.com/rdkcentral/sysint/commit/7b085a2e8737e1bf01d14547113f3a578cbd4f5f)

#### [4.2.2](https://github.com/rdkcentral/sysint/compare/4.2.1...4.2.2)

> 21 January 2026

- RDK-57502 - [RDKE] Migrate Operation Support Log Upload Related Scripts To C Implementation [`#410`](https://github.com/rdkcentral/sysint/pull/410)
- SERXIONE-8331 : Added viper_ipa to exceptions for /media/apps/sky/packages [`#420`](https://github.com/rdkcentral/sysint/pull/420)
- RDK-59247: cleaning up network scripts. [`#402`](https://github.com/rdkcentral/sysint/pull/402)
- RDKEMW-11363: [NM Dispatcher] Reduce repetitive logging [`#415`](https://github.com/rdkcentral/sysint/pull/415)
- Sysint 4.2.2 release changelog updates [`a8ca15d`](https://github.com/rdkcentral/sysint/commit/a8ca15d07e8fcecb408945645892e9e47385e242)
- Merge tag '4.2.1' into develop [`1df413f`](https://github.com/rdkcentral/sysint/commit/1df413f4f00e87a43eb092c6c57e302d754fba90)
- RDK-59247:Migrate Functionality In Network scripts To Core Modules [`8dd5ab9`](https://github.com/rdkcentral/sysint/commit/8dd5ab957251cfc80d6556560386019ca86088cb)

Expand Down
2 changes: 1 addition & 1 deletion etc/10-unmanaged-devices
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[keyfile]
unmanaged-devices=interface-name:ap*;interface-name:dobby*;interface-name:lo;interface-name:p2p*;interface-name:veth*;interface-name:ip*;interface-name:wlan1
unmanaged-devices=interface-name:ap*;interface-name:dobby*;interface-name:lo;interface-name:p2p*;interface-name:veth*;interface-name:ip*;interface-name:wlan1;interface-name:wl0.2
1 change: 1 addition & 0 deletions etc/device.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ NETWORK_ID=192.168.100.0/24
POTOMAC_IDENTITY_FILE=/etc/dropbear/dropbear_rsa_host_key
POTOMAC_USER=root
RDK_EMULATOR=false
LABSIGNED_ENABLED=false
SCHEDULE_REBOOT_INTERVAL=144
UDHCP_INTERFACE=eth0
WAN_INTERFACE=eth0
Expand Down
9 changes: 8 additions & 1 deletion lib/rdk/NM_Bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,14 @@ else
rm -rf /opt/NetworkManager/system-connections/*
fi
if [ -d /opt/secure/NetworkManager/system-connections ]; then
rm -rf /opt/secure/NetworkManager/system-connections/*
echo "`/bin/timestamp` :$0: Listing the connection profiles in device: " >> /opt/logs/NMMonitor.log
ls -lh /opt/secure/NetworkManager/system-connections >> /opt/logs/NMMonitor.log
echo "`/bin/timestamp` :$0: Deleting existing wifi profiles if any..." >> /opt/logs/NMMonitor.log
for f in /opt/secure/NetworkManager/system-connections/*; do
if grep -q "type=wifi" "$f"; then
rm -f "$f"
fi
done
fi
if [ -z $PSK ]; then
#connect to wifi
Expand Down
25 changes: 25 additions & 0 deletions lib/rdk/NM_Dispatcher.sh
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,30 @@ checkDefaultRoute_Add() {
interfaceName=$1
interfaceStatus=$2

if [ "$interfaceStatus" = "connectivity-change" ] && [ -z "$interfaceName" ]; then
NMdispatcherLog "Global connectivity-change - checking all interfaces"
for iface in $ETHERNET_INTERFACE $WIFI_INTERFACE; do
# Skip if interface doesn't exist
if [ ! -e "/sys/class/net/$iface" ]; then
continue
fi
# Check carrier state
CARRIER=$(cat /sys/class/net/$iface/carrier 2>/dev/null || echo "0")
if [ "$CARRIER" = "0" ]; then
NMdispatcherLog "$iface - stopping avahi-autoipd"
/usr/sbin/avahi-autoipd --kill "$iface" 2>/dev/null || true
else
if pgrep -f "avahi-autoipd.*$iface" > /dev/null 2>&1; then
NMdispatcherLog "avahi-autoipd already running for $iface"
else
NMdispatcherLog "Started avahi-autoipd for $iface"
/usr/sbin/avahi-autoipd --daemonize --syslog "$iface"
fi
fi
done
exit 0
fi

if [ "$interfaceStatus" = "up" ]; then

CON_STATE=$(nmcli -t -f GENERAL.STATE device show "$interfaceName" 2>/dev/null | cut -d: -f2)
Expand All @@ -175,6 +199,7 @@ fi

if [ "x$interfaceName" != "x" ] && [ "$interfaceName" != "lo" ]; then
if [ "$interfaceStatus" == "dhcp4-change" ]; then
/usr/sbin/avahi-autoipd --kill "$interfaceName" 2>/dev/null
mode="ipv4"
gwip=$(/sbin/ip -4 route | awk '/default/ { print $3 }' | head -n1 | awk '{print $1;}')
imode=2
Expand Down
58 changes: 13 additions & 45 deletions lib/rdk/Start_MaintenanceTasks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ SWUPDATE_LOG_FILE="$LOG_PATH/swupdate.log"
# Task binaries/ scripts
RFC_BIN="$COMMON_BIN_LOCATION/rfcMgr"
SWUPDATE_BIN="$COMMON_BIN_LOCATION/rdkvfwupgrader"
LOGUPLOAD_SCRIPT="$RDK_PATH/uploadSTBLogs.sh"
LOG_UPLOAD_BIN_PATH="/usr/bin/logupload"

# Log Functions
Expand Down Expand Up @@ -142,7 +141,7 @@ runMaintenanceLogUploadTask()
. /etc/dcm.properties
fi

if [ -f "$LOGUPLOAD_SCRIPT" ]; then
if [ -f "$LOG_UPLOAD_BIN_PATH" ]; then
logUploadLog "Starting log upload"
upload_protocol=$(grep 'LogUploadSettings:UploadRepository:uploadProtocol' /tmp/DCMSettings.conf | cut -d '=' -f2 | sed 's/^"//; s/"$//')
[ -z "$upload_protocol" ] && upload_protocol='HTTP'
Expand All @@ -166,61 +165,29 @@ runMaintenanceLogUploadTask()
uploadOnReboot=0
uploadCheck=$(grep 'urn:settings:LogUploadSettings:UploadOnReboot' /tmp/DCMSettings.conf | cut -d '=' -f2 | sed 's/^"//; s/"$//')
if [ "$uploadCheck" = "true" ]; then
logUploadLog "The value of 'UploadOnReboot' is 'true', executing script uploadSTBLogs.sh"
logUploadLog "The value of 'UploadOnReboot' is 'true', executing logupload binary"
uploadOnReboot=1
elif [ "$uploadCheck" = "false" ]; then
logUploadLog "The value of 'UploadOnReboot' is 'false', executing script uploadSTBLogs.sh"
logUploadLog "The value of 'UploadOnReboot' is 'false', executing logupload binary"
else
logUploadLog "Nothing to do here for uploadCheck value = $uploadCheck"
fi

if [ -n "$TriggerType" ] && [ "$TriggerType" -eq "$ON_DEMAND_LOG_UPLOAD" ]; then
logUploadLog "Application triggered on demand log upload"
if [ -x "$LOG_UPLOAD_BIN_PATH" ]; then
logUploadLog "Executing logupload binary: $LOG_UPLOAD_BIN_PATH"
"$LOG_UPLOAD_BIN_PATH" "$tftp_server" 1 1 "$uploadOnReboot" "$upload_protocol" "$upload_httplink" "ondemand" >> /opt/logs/dcmscript.log
result=$?
if [ "$result" -eq 0 ]; then
logUploadLog "Binary execution succeeded"
exit 0
else
logUploadLog "Binary execution failed with result=$result; falling back to script"
sh $LOGUPLOAD_SCRIPT "$tftp_server" 1 1 "$uploadOnReboot" "$upload_protocol" "$upload_httplink" "$TriggerType" 2>/dev/null
result=$?
fi
else
logUploadLog "logupload binary not found at $LOG_UPLOAD_BIN_PATH...executing script"
sh $LOGUPLOAD_SCRIPT "$tftp_server" 1 1 "$uploadOnReboot" "$upload_protocol" "$upload_httplink" "$TriggerType" 2>&1
result=$?
fi
logUploadLog "Executing logupload binary: $LOG_UPLOAD_BIN_PATH"
"$LOG_UPLOAD_BIN_PATH" "$tftp_server" 1 1 "$uploadOnReboot" "$upload_protocol" "$upload_httplink" "ondemand" >> /opt/logs/dcmscript.log
result=$?
else
logUploadLog "Log upload triggered from regular execution"
if [ -x "$LOG_UPLOAD_BIN_PATH" ]; then
logUploadLog "Executing logupload binary: $LOG_UPLOAD_BIN_PATH"
nice -n 19 "$LOG_UPLOAD_BIN_PATH" "$tftp_server" 1 1 "$uploadOnReboot" "$upload_protocol" "$upload_httplink" >> /opt/logs/dcmscript.log &
bg_pid=$!
wait $bg_pid
result=$?
if [ "$result" -eq 0 ]; then
logUploadLog "Binary execution succeeded"
return 0
else
logUploadLog "Binary execution failed with result=$result; falling back to script"
nice -n 19 sh $LOGUPLOAD_SCRIPT "$tftp_server" 1 1 "$uploadOnReboot" "$upload_protocol" "$upload_httplink" &
bg_pid=$!
wait $bg_pid
result=$?
fi
else
logUploadLog "logupload binary not found at $LOG_UPLOAD_BIN_PATH...executing script"
nice -n 19 sh $LOGUPLOAD_SCRIPT "$tftp_server" 1 1 "$uploadOnReboot" "$upload_protocol" "$upload_httplink" &
bg_pid=$!
wait $bg_pid
result=$?
fi
logUploadLog "Executing logupload binary: $LOG_UPLOAD_BIN_PATH"
nice -n 19 "$LOG_UPLOAD_BIN_PATH" "$tftp_server" 1 1 "$uploadOnReboot" "$upload_protocol" "$upload_httplink" >> /opt/logs/dcmscript.log &
bg_pid=$!
wait $bg_pid
result=$?
fi
else
logUploadLog "LOGUPLOAD script not found"
logUploadLog "LOGUPLOAD binary not found"
result=-1
fi

Expand Down Expand Up @@ -256,3 +223,4 @@ case "$1" in
exit 2
;;
esac

Loading
Loading