system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 10:46:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nm-online: print "[started|start-pending|failure]" for --wait-for-startup

Browse source 
`nm-online --wait-for-startup` isn't really intended to be called directly.
It is mainly for implementing "NetworkManager-wait-online.service".

Anyway, at the end, the result does not indicate the connectivty status
of the host. Hence, printing

  Connecting...............   30s [online]

is misleading. It merely means, that startup is complete. Likewise,
printing "[offline]" would not mean that there is no connectivity.
Instead, it means that startup is still in progress on timeout.

As it is now, the distinction between whether to print "start-pending"
and "failure" is not very clear. Not that it matters much. At least is
corresponds to the exit status of the program. If we sometimes confuse
EXIT_FAILURE_OFFLINE with other failure reasons, the exit status needs
to be corrected first.

https://github.com/NetworkManager/NetworkManager/pull/152
This commit is contained in:
Thomas Haller 2018-06-29 11:00:38 +02:00
parent c5951f5917
commit 7f2b7ee4cd
1 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
clients/nm-online.c
View file

@ -40,6 +40,7 @@
#define PROGRESS_STEPS 15
#define EXIT_NONE -1
#define EXIT_FAILURE_OFFLINE 1
#define EXIT_FAILURE_ERROR 2
#define EXIT_FAILURE_LIBNM_BUG 42
@ -80,7 +81,7 @@ _return (OnlineData *data, int retval)
}
static void
_print_progress (int progress_next_step_i, gint64 remaining_ms, int success)
_print_progress (gboolean wait_startup, int progress_next_step_i, gint64 remaining_ms, int retval)
{
int i, j;
@ -90,8 +91,26 @@ _print_progress (int progress_next_step_i, gint64 remaining_ms, int success)
for (i = 0; i < PROGRESS_STEPS; i++)
putchar (i < j ? '.' : ' ');
g_print (" %4lds", (long) (MAX (0, remaining_ms + 999) / 1000));
if (success >= 0)
g_print (" [%sline]\n", success ? "on" : "off");
if (retval != EXIT_NONE) {
const char *result;
if (wait_startup) {
if (retval == EXIT_SUCCESS)
result = "started";
else if (retval == EXIT_FAILURE_OFFLINE)
result = "startup-pending";
else
result = "failure";
}
else {
if (retval == EXIT_SUCCESS)
result = "online";
else
result = "offline";
}
g_print (" [%s]\n", result);
}
fflush (stdout);
}
@ -156,7 +175,7 @@ handle_timeout (gpointer user_data)
/* calculate the next step (not the current): floor()+1 */
progress_next_step_i = NM_MIN ((elapsed_ms / data->progress_step_duration) + 1, PROGRESS_STEPS);
_print_progress (progress_next_step_i, remaining_ms, -1);
_print_progress (data->wait_startup, progress_next_step_i, remaining_ms, EXIT_NONE);
/* synchronize the timeout with the ticking of the seconds. */
rem = remaining_ms % 1000;
@ -294,7 +313,7 @@ main (int argc, char *argv[])
g_clear_pointer (&data.loop, g_main_loop_unref);
if (!data.quiet)
_print_progress (-1, NM_MAX (0, data.end_timestamp_ms - _now_ms ()), data.retval == EXIT_SUCCESS);
_print_progress (data.wait_startup, -1, NM_MAX (0, data.end_timestamp_ms - _now_ms ()), data.retval);
return data.retval;
}