* initscript/Debian/.cvsignore:
	* initscript/Slackware/.cvsignore:
	Added new cvsignores for Makefile, Makefile.in

	* test/.cvsignore:
	Added nmtestdevices

	* src/NetworkManagerDevice.c:
	* src/NetworkManager.c:
	Updated the wireless/wired HAL device strings from net.ethernet to
	net.80203 or net.80211 depending on wired or wireless respectively
	Should probably update the configure.in to ask for the correct HAL
	version now.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@168 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
clarkbw
2004-09-22 17:34:15 +00:00
committed by Bryan W. Clark
parent 9f2632a8ef
commit 14653e2021
7 changed files with 49 additions and 17 deletions

View File

@@ -258,7 +258,7 @@ static void nm_hal_device_new_capability (LibHalContext *ctx, const char *udi, c
syslog( LOG_DEBUG, "nm_hal_device_new_capability() called with udi = %s, capability = %s", udi, capability );
if (capability && (strcmp (capability, "net.ethernet") == 0))
if (capability && ((strcmp (capability, "net.80203") == 0) || (strcmp (capability, "net.80211") == 0)))
{
char *iface;
@@ -308,7 +308,7 @@ static void nm_add_initial_devices (NMData *data)
g_return_if_fail (data != NULL);
/* Grab a list of network devices */
net_devices = hal_find_device_by_capability (data->hal_ctx, "net.ethernet", &num_net_devices);
net_devices = hal_find_device_by_capability (data->hal_ctx, "net", &num_net_devices);
if (net_devices)
{
for (i = 0; i < num_net_devices; i++)