Release/4.0.0 #357
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -19,11 +19,13 @@ | |||||
| # limitations under the License. | ||||||
| ############################################################################## | ||||||
|
|
||||||
| RDK_PROFILE=$(grep "RDK_PROFILE" /etc/device.properties | cut -d '=' -f 2) | ||||||
| RDKV_SUPP_CONF="/opt/secure/wifi/wpa_supplicant.conf" | ||||||
|
|
||||||
|
|
||||||
| if [ -f $RDKV_SUPP_CONF ]; then | ||||||
| SSID=$(cat $RDKV_SUPP_CONF | grep -w ssid= | cut -d '"' -f 2) | ||||||
| PSK_LINE=$(grep psk= "$RDKV_SUPP_CONF") | ||||||
|
|
||||||
| # Case 1: Quoted passphrase | ||||||
| if [[ "$PSK_LINE" =~ psk=\"(.+)\" ]]; then | ||||||
|
|
@@ -37,6 +39,35 @@ if [ -f $WIFI_WPA_SUPPLICANT_CONF ]; then | |||||
| else | ||||||
| PSK="" | ||||||
| fi | ||||||
| sed -i '/network={/,/}/d' /opt/secure/wifi/wpa_supplicant.conf | ||||||
| fi | ||||||
|
|
||||||
| if [ -z $SSID ]; then | ||||||
| echo "`/bin/timestamp` :$0: No SSID found in supplicant conf" >> /opt/logs/NMMonitor.log | ||||||
| echo "`/bin/timestamp` :$0: Trying with previously configured settings" >> /opt/logs/NMMonitor.log | ||||||
|
|
||||||
| if [ ! -d /opt/secure/NetworkManager/system-connections ]; then | ||||||
| mkdir -p /opt/secure/NetworkManager/system-connections | ||||||
| fi | ||||||
| if [ -d /opt/NetworkManager/system-connections ]; then | ||||||
| cp /opt/NetworkManager/system-connections/* /opt/secure/NetworkManager/system-connections/ | ||||||
|
There was a problem hiding this comment. The wildcard expansion
Suggested change
|
||||||
| rm -rf /opt/NetworkManager/system-connections/* | ||||||
| fi | ||||||
| nmcli conn reload | ||||||
| else | ||||||
| if [ -d /opt/NetworkManager/system-connections ]; then | ||||||
| rm -rf /opt/NetworkManager/system-connections/* | ||||||
| fi | ||||||
| if [ "$RDK_PROFILE" == "TV" ]; then | ||||||
| echo "`/bin/timestamp` :$0: Migrating Wifi credentials for TVs from NM_Bootsrtap" >> /opt/logs/NMMonitor.log | ||||||
|
There was a problem hiding this comment. Corrected spelling of 'NM_Bootsrtap' to 'NM_Bootstrap'.
Suggested change
|
||||||
| fi | ||||||
| if [ -z $PSK ]; then | ||||||
|
There was a problem hiding this comment. Variable
Suggested change
|
||||||
| #connect to wifi | ||||||
| nmcli conn add type wifi con-name "$SSID" autoconnect yes ifname wlan0 ssid "$SSID" | ||||||
| nmcli conn reload | ||||||
| else | ||||||
| #connect to wifi | ||||||
| nmcli conn add type wifi con-name "$SSID" autoconnect yes ifname wlan0 ssid "$SSID" wifi-sec.key-mgmt wpa-psk wifi-sec.psk "$PSK" | ||||||
| nmcli conn reload | ||||||
| fi | ||||||
| fi | ||||||
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
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
|
|
@@ -107,15 +107,9 @@ interfaceName=$1 | |||
| interfaceStatus=$2 | ||||
|
|
||||
| if [ "$interfaceStatus" = "up" ]; then | ||||
|
|
||||
|
There was a problem hiding this comment. Remove this empty line that was left behind after removing the
Suggested change
|
||||
| CON_STATE=$(nmcli -t -f GENERAL.STATE device show "$interfaceName" 2>/dev/null | cut -d: -f2) | ||||
| NMdispatcherLog "Connection state of interface $interfaceName=$CON_STATE" | ||||
| fi | ||||
|
|
||||
| if [ "x$interfaceName" != "x" ] && [ "$interfaceName" != "lo" ]; then | ||||
|
|
||||
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| [Unit] | ||
|
Check failure on line 1 in systemd_units/NetworkManager_ecfs.conf
|
||
| After=securemount.service | ||
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| [Unit] | ||
| Description=Log Internet connectivity and Trigger network target | ||
| After=dbus.service | ||
|
|
||
| [Service] | ||
| Type=oneshot | ||
| ExecStartPre=/bin/touch /tmp/connectivity_check_done | ||
| ExecStart=/lib/rdk/logMilestone.sh "INTERNET_FULLY_CONNECTED" |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Variable
$SSIDshould be quoted to properly handle empty values. The current syntax[ -z $SSID ]will fail if SSID is unset or contains whitespace. Use[ -z \"$SSID\" ]instead.