NetworkManager from fedora-updates-testing broken on F11-XO1

[Bernie Innocenti]

On Mon, 2010-02-22 at 12:08 -0300, Bernie Innocenti wrote:
> On Thu, 2010-02-18 at 09:55 -0800, Dan Williams wrote:
> > It'll probably take more investigation than I have time for this week,
> > so I'll just patch NM to accept the invalid driver name ('usb') as a
> > fallback.  Which is the behavior that 0.7.2 had anyway, so you can
> > consider it a regression in 0.7.2.995.  We'll eventually fix libertas
> > but I don't think we should block this on a libertas fix.
> 
> Can you please build a new NetworkManager package in F11 with this
> work-around applied?

I've scratch-built custom rpms with a crude patch of mine which seems to
fix the issue:

  http://koji.fedoraproject.org/koji/taskinfo?taskID=2006014


diff --git a/src/nm-device-olpc-mesh.c b/src/nm-device-olpc-mesh.c
index edbba81..8554b95 100644
--- a/src/nm-device-olpc-mesh.c
+++ b/src/nm-device-olpc-mesh.c
@@ -935,12 +935,11 @@ nm_device_olpc_mesh_new (const char *udi,
 
 	g_return_val_if_fail (udi != NULL, NULL);
 	g_return_val_if_fail (iface != NULL, NULL);
-	g_return_val_if_fail (driver != NULL, NULL);
 
 	obj = g_object_new (NM_TYPE_DEVICE_OLPC_MESH,
 	                    NM_DEVICE_INTERFACE_UDI, udi,
 	                    NM_DEVICE_INTERFACE_IFACE, iface,
-	                    NM_DEVICE_INTERFACE_DRIVER, driver,
+	                    NM_DEVICE_INTERFACE_DRIVER, driver ? driver : "usb",
 	                    NM_DEVICE_INTERFACE_MANAGED, managed,
 	                    NULL);
 	if (obj == NULL)
diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c
index fdc6f78..53dcd59 100644
--- a/src/nm-device-wifi.c
+++ b/src/nm-device-wifi.c
@@ -3546,12 +3546,11 @@ nm_device_wifi_new (const char *udi,
 
 	g_return_val_if_fail (udi != NULL, NULL);
 	g_return_val_if_fail (iface != NULL, NULL);
-	g_return_val_if_fail (driver != NULL, NULL);
 
 	obj = g_object_new (NM_TYPE_DEVICE_WIFI,
 	                    NM_DEVICE_INTERFACE_UDI, udi,
 	                    NM_DEVICE_INTERFACE_IFACE, iface,
-	                    NM_DEVICE_INTERFACE_DRIVER, driver,
+	                    NM_DEVICE_INTERFACE_DRIVER, driver ? driver : "usb",
 	                    NM_DEVICE_INTERFACE_MANAGED, managed,
 	                    NULL);
 	if (obj == NULL)

-- 
   // Bernie Innocenti - http://codewiz.org/
 \X/  Sugar Labs       - http://sugarlabs.org/