[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH rhel6-branch 04/11] Wait for activation of specific devices instead of NM (#638131)



> diff --git a/loader/net.c b/loader/net.c
> index ee370ac..469f798 100644
> --- a/loader/net.c
> +++ b/loader/net.c
> @@ -482,12 +482,12 @@ int readNetConfig(char * device, iface_t * iface,
>              return LOADER_BACK;
>          }
>  
> -        i = get_connection(iface);
> +        i = wait_for_iface_activation(iface->device);
>          newtPopWindow();
>  
>          if (i > 0) {
>              if (FL_CMDLINE(flags)) {
> -                fprintf(stderr, _("There was an error configuring your network "
> +                fprintf(stderr, _("There was an error activating your network "
>                                    "interface."));
>                  fprintf(stderr, _("\nThis cannot be corrected in cmdline mode.\n"
>                                    "Halting.\n"));

I'm not really so much of a fan of changing translated strings in a
released product unless we absolutely have to.

> @@ -2106,29 +2111,32 @@ void splitHostname (char *str, char **host, char **port)
>  }
>  
>  /*
> - * Start NetworkManager and wait for a valid link, return non-zero on error.
> + * Wait for activation of iface by NetworkManager, return non-zero on error.
> + * If iface == NULL wait for any device.
>   */
> -int get_connection(iface_t *iface) {
> -    int count = 0;
> +int wait_for_iface_activation(char *ifname) {
> +    int count = 0, i;
>      NMClient *client = NULL;
>      NMState state;
>      GMainLoop *loop;
>      GMainContext *ctx;
> +    const GPtrArray *devices;
> +    NMDevice *device = NULL;
>  
> -    if (iface == NULL) {
> +    if (ifname == NULL) {
>          return 1;
>      }

How does bailing at the very beginning of the function on NULL match the
behavior described in the comment up top?

- Chris


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]