Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 1 addition & 7 deletions lib/rdk/NM_Dispatcher.sh
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,9 @@ interfaceName=$1
interfaceStatus=$2

if [ "$interfaceStatus" = "up" ]; then
/usr/bin/nm-online -q -t 60 # If Network manager is not online wait for 60 sec. TODO: Revisit this during connectivity check enable time

CON_STATE=$(nmcli -t -f GENERAL.STATE device show "$interfaceName" 2>/dev/null | cut -d: -f2)
NMdispatcherLog "Connection state of interface $interfaceName=$CON_STATE"
if [ "$CON_STATE" = "100 (connected)" ] || [ "$CON_STATE" = "120 (connected (site only))" ]; then
NMdispatcherLog "Connection state of $interfaceName is connected."
sh /lib/rdk/connectivitycheck.sh &
else
NMdispatcherLog "Connection state of $interfaceName Up But Not Fully connected."
fi
fi

if [ "x$interfaceName" != "x" ] && [ "$interfaceName" != "lo" ]; then
Expand Down
79 changes: 0 additions & 79 deletions lib/rdk/connectivitycheck.sh

This file was deleted.

4 changes: 2 additions & 2 deletions systemd_units/coredump-secure-upload.service
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
[Unit]
Description=COREDUMP UPLOAD

After=network-up.target tr69hostif.service
Requires=network-up.target
After=network-online.target tr69hostif.service
Requires=network-online.target

[Service]
ExecStart=/lib/rdk/uploadDumps.sh "" 1 secure
Expand Down
4 changes: 2 additions & 2 deletions systemd_units/coredump-upload.service
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
[Unit]
Description=COREDUMP UPLOAD

After=network-up.target
Requires=network-up.target
After=network-online.target
Requires=network-online.target

[Service]
ExecStart=/lib/rdk/uploadDumps.sh "" 1
Expand Down
4 changes: 2 additions & 2 deletions systemd_units/minidump-secure-upload.service
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
[Unit]
Description=MINIDUMP UPLOAD

After=network-up.target tr69hostif.service
Requires=network-up.target
After=network-online.target tr69hostif.service
Requires=network-online.target

[Service]
ExecStart=/lib/rdk/uploadDumps.sh "" 0 secure
Expand Down
4 changes: 2 additions & 2 deletions systemd_units/minidump-upload.service
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
[Unit]
Description=MINIDUMP UPLOAD

After=network-up.target
Requires=network-up.target
After=network-online.target
Requires=network-online.target

[Service]
ExecStart=/lib/rdk/uploadDumps.sh "" 0
Expand Down
8 changes: 8 additions & 0 deletions systemd_units/notify-network-ready.service
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"