Rebase - #588
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR appears to be a rebase/merge-conflict cleanup across several RDK helper scripts and properties files, along with a few functional tweaks (SSH key selection logic and an RFC sync completion flag).
Changes:
- Resolves merge-conflict artifacts in multiple shell scripts and
CHANGELOG.md. - Updates SSH startup logic (
start_ssh.sh) to vary authorized key selection by build type / device type. - Removes several legacy scripts and strips hardcoded server/credential properties from
etc/*.properties.
Reviewed changes
Copilot reviewed 13 out of 13 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| lib/rdk/update_previous_reboot_info.sh | Deleted reboot-reason persistence script. |
| lib/rdk/timesyncd-conf-update.sh | Removes merge-conflict markers around NTP partner property logging. |
| lib/rdk/system_info_collector.sh | Removes merge-conflict markers around meminfo telemetry. |
| lib/rdk/start_ssh.sh | Changes Dropbear authorized key selection logic; currently introduces a build-type conditional bug. |
| lib/rdk/Start_MaintenanceTasks.sh | Adds /tmp/.RFCsynccomplete marker after RFC task execution. |
| lib/rdk/rebootNow.sh | Deleted reboot orchestration script (currently still referenced elsewhere). |
| lib/rdk/networkConnectionRecovery.sh | Resolves merge-conflict markers and keeps updated packet-loss evaluation logic. |
| lib/rdk/getDeviceDetails.sh | Removes merge-conflict markers in Bluetooth MAC selection path. |
| lib/rdk/core_shell.sh | Removes merge-conflict markers in core-dump process allowlist. |
| lib/rdk/backup_logs.sh | Deletes legacy log backup script. |
| etc/config.properties | Removes hardcoded crash/log server values and plaintext credentials. |
| etc/common.properties | Removes hardcoded crash/proxy/CDL/TFTP server values. |
| CHANGELOG.md | Removes merge-conflict section(s) near the top of the changelog. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+77
to
89
| if [ "BUILD_TYPE" != "dev" ]; then | ||
| DEVICETYPE=$(tr181 -d Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Identity.DeviceType 2>&1 > /dev/null) | ||
| if [ "$DEVICETYPE" = "TEST" ]; then | ||
| USE_DEVKEYS="-f authorized_keys_dev" | ||
| echo " dropbear using dev authorization keys" | ||
| else | ||
| USE_DEVKEYS="" | ||
| echo " dropbear using prod authorization keys" | ||
| fi | ||
| else | ||
| USE_DEVKEYS="" | ||
| echo " dropbear using prod authorization keys" | ||
| echo " Build type is dev , use dev authorization keys by default" | ||
| fi |
Comment on lines
7
to
15
| #### [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) |
NareshM1702
force-pushed
the
topic/RDK-61784
branch
from
July 30, 2026 09:25
98b3d52 to
13eaadd
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.