Hello community, here is the log from the commit of package NetworkManager for openSUSE:Factory checked in at 2017-10-02 16:51:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/NetworkManager (Old) and /work/SRC/openSUSE:Factory/.NetworkManager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager" Mon Oct 2 16:51:35 2017 rev:172 rq:528644 version:1.8.4 Changes: -------- --- /work/SRC/openSUSE:Factory/NetworkManager/NetworkManager.changes 2017-09-24 11:41:38.624390857 +0200 +++ /work/SRC/openSUSE:Factory/.NetworkManager.new/NetworkManager.changes 2017-10-02 16:51:36.368266938 +0200 @@ -1,0 +2,6 @@ +Mon Sep 25 06:50:03 UTC 2017 - [email protected] + +- Modify nm-dont-overwrite-resolv-conf.patch: make netconfig call + an atomic action, don't kill it after 2000ms (bsc#960153). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.iQQNxl/_old 2017-10-02 16:51:37.524104712 +0200 +++ /var/tmp/diff_new_pack.iQQNxl/_new 2017-10-02 16:51:37.524104712 +0200 @@ -42,7 +42,7 @@ # PATCH-FIX-OPENSUSE networkmanager-obs-net.patch [email protected] -- disable tests that are by design broken on OBS workers Patch3: networkmanager-obs-net.patch BuildRequires: dnsmasq -# PATCH-FIX-OPENSUSE nm-dont-overwrite-resolv-conf.patch bsc#1021665, bsc#960153 [email protected] -- NetworkManager spawns netconfig to update DNS settings, and terminates netconfig after 1s. But 1s isn't quite long enough for netconfig to complete the task. Adjust it to 2 seconds to avoid NM overwriting /etc/resolv.conf. +# PATCH-FIX-OPENSUSE nm-dont-overwrite-resolv-conf.patch bsc#1021665, bsc#960153 [email protected] -- NetworkManager spawns netconfig to update DNS settings, and terminates netconfig after 1s. But 1s isn't quite long enough for netconfig to complete the task. Adjust it to 0 seconds(don't send SIGKILL) to avoid NM overwriting /etc/resolv.conf. Patch4: nm-dont-overwrite-resolv-conf.patch BuildRequires: fdupes BuildRequires: intltool ++++++ nm-dont-overwrite-resolv-conf.patch ++++++ --- /var/tmp/diff_new_pack.iQQNxl/_old 2017-10-02 16:51:37.600094046 +0200 +++ /var/tmp/diff_new_pack.iQQNxl/_new 2017-10-02 16:51:37.604093485 +0200 @@ -7,7 +7,7 @@ /* Wait until the process exits */ - if (!nm_utils_kill_child_sync (pid, 0, LOGD_DNS, "netconfig", &status, 1000, 0)) { -+ if (!nm_utils_kill_child_sync (pid, 0, LOGD_DNS, "netconfig", &status, 2000, 0)) { ++ if (!nm_utils_kill_child_sync (pid, 0, LOGD_DNS, "netconfig", &status, 0, 0)) { int errsv = errno; g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_FAILED,
