Mailinglist Archive: opensuse-commit (750 mails)
| < Previous | Next > |
commit NetworkManager for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Mon, 05 Oct 2009 23:44:37 +0200
- Message-id: <20091005214437.B66A2637D@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package NetworkManager for openSUSE:Factory
checked in at Mon Oct 5 23:44:37 CEST 2009.
--------
--- NetworkManager/NetworkManager.changes 2009-09-14 11:35:20.000000000
+0200
+++ NetworkManager/NetworkManager.changes 2009-10-05 09:26:44.000000000
+0200
@@ -1,0 +2,6 @@
+Mon Oct 5 07:22:17 UTC 2009 - tambet@xxxxxxxxxx
+
+- Never fall back to manually updating resolv.conf, even if
+ netconfig fails (bnc #537907, #544195).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager.spec ++++++
--- /var/tmp/diff_new_pack.1VGGpA/_old 2009-10-05 23:44:12.000000000 +0200
+++ /var/tmp/diff_new_pack.1VGGpA/_new 2009-10-05 23:44:12.000000000 +0200
@@ -21,7 +21,7 @@
Url: http://www.gnome.org/projects/NetworkManager/
%define rversion 0.7.1
Version: 0.7.1_git20090811
-Release: 2
+Release: 3
License: GPL v2 or later
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: PolicyKit-devel dhcp-client gtk-doc hal-devel intltool
iproute2 libgcrypt-devel libiw-devel libnl-devel libtool libuuid-devel
mozilla-nss-devel ppp-devel translation-update-upstream
++++++ 0012-Update-resolv.conf-once.patch ++++++
--- /var/tmp/diff_new_pack.1VGGpA/_old 2009-10-05 23:44:13.000000000 +0200
+++ /var/tmp/diff_new_pack.1VGGpA/_new 2009-10-05 23:44:13.000000000 +0200
@@ -4,10 +4,10 @@
Subject: [PATCH] Update resolv.conf once.
-Index: b/src/NetworkManagerPolicy.c
+Index: NetworkManager-0.7.1/src/NetworkManagerPolicy.c
===================================================================
---- a/src/NetworkManagerPolicy.c
-+++ b/src/NetworkManagerPolicy.c
+--- NetworkManager-0.7.1.orig/src/NetworkManagerPolicy.c
++++ NetworkManager-0.7.1/src/NetworkManagerPolicy.c
@@ -553,7 +553,7 @@ update_routing_and_dns (NMPolicy *policy
}
@@ -29,10 +29,10 @@
}
static void
-Index: b/src/named-manager/nm-named-manager.c
+Index: NetworkManager-0.7.1/src/named-manager/nm-named-manager.c
===================================================================
---- a/src/named-manager/nm-named-manager.c
-+++ b/src/named-manager/nm-named-manager.c
+--- NetworkManager-0.7.1.orig/src/named-manager/nm-named-manager.c
++++ NetworkManager-0.7.1/src/named-manager/nm-named-manager.c
@@ -183,7 +183,6 @@ static gboolean
dispatch_netconfig (const char *domain,
char **searches,
@@ -93,7 +93,7 @@
{
NMNamedManagerPrivate *priv;
NMIP4Config *composite;
-@@ -524,19 +519,19 @@ rewrite_resolv_conf (NMNamedManager *mgr
+@@ -524,19 +519,22 @@ rewrite_resolv_conf (NMNamedManager *mgr
g_object_unref (composite);
#ifdef RESOLVCONF_PATH
@@ -102,12 +102,19 @@
#endif
#ifdef TARGET_SUSE
- if (success == FALSE)
+- if (success == FALSE)
- success = dispatch_netconfig (domain, searches, nameservers,
iface,
-+ success = dispatch_netconfig (domain, searches, nameservers,
-
g_object_get_data (G_OBJECT (composite), "NISDOMAIN"),
-
g_object_get_data (G_OBJECT (composite), "NISSERVERS"),
-
error);
+-
g_object_get_data (G_OBJECT (composite), "NISDOMAIN"),
+-
g_object_get_data (G_OBJECT (composite), "NISSERVERS"),
+-
error);
++ if (success == FALSE) {
++ /* On SUSE, never fall back to manual resolv.conf updating. */
++ success = TRUE;
++ dispatch_netconfig (domain, searches, nameservers,
++ g_object_get_data
(G_OBJECT (composite), "NISDOMAIN"),
++ g_object_get_data
(G_OBJECT (composite), "NISSERVERS"),
++ error);
++ }
#endif
if (success == FALSE)
@@ -116,7 +123,7 @@
if (success)
nm_system_update_dns ();
-@@ -549,7 +544,6 @@ rewrite_resolv_conf (NMNamedManager *mgr
+@@ -549,7 +547,6 @@ rewrite_resolv_conf (NMNamedManager *mgr
gboolean
nm_named_manager_add_ip4_config (NMNamedManager *mgr,
@@ -124,7 +131,7 @@
NMIP4Config *config,
NMNamedIPConfigType cfg_type)
{
-@@ -557,7 +551,6 @@ nm_named_manager_add_ip4_config (NMNamed
+@@ -557,7 +554,6 @@ nm_named_manager_add_ip4_config (NMNamed
GError *error = NULL;
g_return_val_if_fail (mgr != NULL, FALSE);
@@ -132,7 +139,7 @@
g_return_val_if_fail (config != NULL, FALSE);
priv = NM_NAMED_MANAGER_GET_PRIVATE (mgr);
-@@ -577,7 +570,7 @@ nm_named_manager_add_ip4_config (NMNamed
+@@ -577,7 +573,7 @@ nm_named_manager_add_ip4_config (NMNamed
if (!g_slist_find (priv->configs, config))
priv->configs = g_slist_append (priv->configs, g_object_ref
(config));
@@ -141,7 +148,7 @@
nm_warning ("Could not commit DNS changes. Error: '%s'", error
? error->message : "(none)");
g_error_free (error);
}
-@@ -587,14 +580,12 @@ nm_named_manager_add_ip4_config (NMNamed
+@@ -587,14 +583,12 @@ nm_named_manager_add_ip4_config (NMNamed
gboolean
nm_named_manager_remove_ip4_config (NMNamedManager *mgr,
@@ -156,7 +163,7 @@
g_return_val_if_fail (config != NULL, FALSE);
priv = NM_NAMED_MANAGER_GET_PRIVATE (mgr);
-@@ -613,7 +604,7 @@ nm_named_manager_remove_ip4_config (NMNa
+@@ -613,7 +607,7 @@ nm_named_manager_remove_ip4_config (NMNa
g_object_unref (config);
@@ -165,10 +172,10 @@
nm_warning ("Could not commit DNS changes. Error: '%s'", error
? error->message : "(none)");
if (error)
g_error_free (error);
-Index: b/src/named-manager/nm-named-manager.h
+Index: NetworkManager-0.7.1/src/named-manager/nm-named-manager.h
===================================================================
---- a/src/named-manager/nm-named-manager.h
-+++ b/src/named-manager/nm-named-manager.h
+--- NetworkManager-0.7.1.orig/src/named-manager/nm-named-manager.h
++++ NetworkManager-0.7.1/src/named-manager/nm-named-manager.h
@@ -69,12 +69,10 @@ GType nm_named_manager_get_type (void);
NMNamedManager * nm_named_manager_get (void);
@@ -182,10 +189,10 @@
NMIP4Config *config);
G_END_DECLS
-Index: b/src/nm-device.c
+Index: NetworkManager-0.7.1/src/nm-device.c
===================================================================
---- a/src/nm-device.c
-+++ b/src/nm-device.c
+--- NetworkManager-0.7.1.orig/src/nm-device.c
++++ NetworkManager-0.7.1/src/nm-device.c
@@ -1976,7 +1976,7 @@ nm_device_set_ip4_config (NMDevice *self
named_mgr = nm_named_manager_get ();
if (old_config) {
@@ -205,10 +212,10 @@
nm_device_update_ip4_address (self);
}
}
-Index: b/src/vpn-manager/nm-vpn-connection.c
+Index: NetworkManager-0.7.1/src/vpn-manager/nm-vpn-connection.c
===================================================================
---- a/src/vpn-manager/nm-vpn-connection.c
-+++ b/src/vpn-manager/nm-vpn-connection.c
+--- NetworkManager-0.7.1.orig/src/vpn-manager/nm-vpn-connection.c
++++ NetworkManager-0.7.1/src/vpn-manager/nm-vpn-connection.c
@@ -506,7 +506,7 @@ nm_vpn_connection_ip4_config_get (DBusGP
/* Add the VPN to DNS */
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |