Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve restart of NetworkManager #20651

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Improve restart of NetworkManager #20651

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8698f03
Do not wait indefinitely for NM connectivity
nicksinger Nov 15, 2024
bad9f19
Allow matching for multiple valid connectivity states
nicksinger Nov 15, 2024
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
2 changes: 1 addition & 1 deletion lib/mm_network.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ sub restart_networking {
# Wait until the connections are configured
my $expected_nm_connectivity = get_var('EXPECTED_NM_CONNECTIVITY', 'full');
if ($expected_nm_connectivity ne 'none') {
assert_script_run "until nmcli networking connectivity check | tee /dev/stderr | grep '$expected_nm_connectivity'; do sleep 10; done";
assert_script_run "timeout 90 bash -c \"until nmcli networking connectivity check | tee /dev/stderr | grep -E '$expected_nm_connectivity'; do sleep 10; done\"";
}
} else {
assert_script_run 'rcnetwork restart';
Expand Down
Loading