Hello community, here is the log from the commit of package NetworkManager for openSUSE:Factory checked in at 2017-06-12 15:08:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/NetworkManager (Old) and /work/SRC/openSUSE:Factory/.NetworkManager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager" Mon Jun 12 15:08:45 2017 rev:166 rq:501753 version:1.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/NetworkManager/NetworkManager.changes 2017-05-03 15:52:09.434857017 +0200 +++ /work/SRC/openSUSE:Factory/.NetworkManager.new/NetworkManager.changes 2017-06-12 15:08:50.995998047 +0200 @@ -1,0 +2,6 @@ +Thu Jun 1 02:36:58 UTC 2017 - [email protected] + +- Add nm-dont-overwrite-resolv-conf.patch: Fix NetworkManager + overwriting /etc/resolv.conf (bsc#960153, bsc#1021665). + +------------------------------------------------------------------- New: ---- nm-dont-overwrite-resolv-conf.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.2m9ecJ/_old 2017-06-12 15:08:53.271676796 +0200 +++ /var/tmp/diff_new_pack.2m9ecJ/_new 2017-06-12 15:08:53.271676796 +0200 @@ -40,6 +40,8 @@ Patch0: systemd-network-config.patch # PATCH-FIX-UPSTREAM nm-probe-radius-server-cert.patch bnc#574266 [email protected] -- Probe the RADIUS server certificate Patch1: nm-probe-radius-server-cert.patch +# 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. +Patch2: nm-dont-overwrite-resolv-conf.patch BuildRequires: fdupes BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc @@ -245,6 +247,7 @@ %if %{with_cacert_patch} %patch1 -p1 %endif +%patch2 -p1 %build pppddir=`ls -1d /usr/%_lib/pppd/2*` ++++++ nm-dont-overwrite-resolv-conf.patch ++++++ Index: NetworkManager-1.0.12/src/dns/nm-dns-manager.c =================================================================== --- NetworkManager-1.0.12.orig/src/dns/nm-dns-manager.c +++ NetworkManager-1.0.12/src/dns/nm-dns-manager.c @@ -315,7 +315,7 @@ dispatch_netconfig (char **searches, close (fd); /* 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)) { int errsv = errno; g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_FAILED,
