----- Original Message -----
> From: "Dan Williams" <[email protected]>
> To: "Bastien Nocera" <[email protected]>
> > I'm pretty sure that your commit
> > 1a7e7c9031526b0c8973965c826ad7d1b7cc22f9 is the one causing the
> > regression:
> > http://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=1a7e7c9031526b0c8973965c826ad7d1b7cc22f9
Correct.
> > It's basically loading anything that lies around, even if it's not
> > relevant for the distribution used.
Yes, we want to keep the NM behavior simple on that matter, I suppose.
> Oh fun. I suppose we should strip out any script thats specified in
> that file when copying its configuration to the one that we actually
> send to dhclient.
Agreed.
> Would something like this fix it?
>
> diff --git a/src/dhcp-manager/nm-dhcp-dhclient-utils.c
> b/src/dhcp-manager/nm-dhcp-dhclient-utils.c
> index 8dc7902..d311d50 100644
> --- a/src/dhcp-manager/nm-dhcp-dhclient-utils.c
> +++ b/src/dhcp-manager/nm-dhcp-dhclient-utils.c
> @@ -168,6 +168,10 @@ nm_dhcp_dhclient_create_config (const char
> *interface,
> continue;
> }
>
> + /* Ignore 'script' since we pass our own */
> + if (g_str_has_prefix (p, "script "))
> + continue;
> +
> /* Check for "also require" */
> if (!strncmp (p, ALSOREQ_TAG, strlen
> (ALSOREQ_TAG))) {
> in_alsoreq = TRUE;
>
>
> Dan
+1
Thanks to both of you.
Pavel
_______________________________________________
networkmanager-list mailing list
[email protected]
https://mail.gnome.org/mailman/listinfo/networkmanager-list
