Comment 17 for bug 1969901

Revision history for this message
HÃ¥kan Kvist (hakankvist) wrote :

Agreed, commit d017022 seems to be missing.
I will cherry-pick it locally and retest.

I did some more comparing of the file nm-device.c where the changes was made.

I think d017022 is the only relevant follow up change.

I compared the commit with the original fix with on the 1.10 track with latest commit on the 1.10 track by doing:

git blame 7fbbe7ebee99785e38d39c37e515a64a28edef0f -- src/devices/nm-device.c > commit_7fbbe7ebee99785e38d39c37e515a64a28edef0f.txt
git blame remotes/origin/nm-1-10 -- src/devices/nm-device.c > commit_1_10.txt
<diff-tool-of-choice> commit_7fbbe7ebee99785e38d39c37e515a64a28edef0f.txt commit_1_10.txt

I could not find any other connected changes on rows (or close to rows) modified by 7fbbe7ebee99785e38d39c37e515a64a28edef0f except for the changes by d017022.

The commit d7ebbd69a05c8bee636c5eeba2206176ba29bdc3 (core: implement setting MDNS setting for systemd) was changing into the same methods, but it added completely new functionality so not related.