[Linux-wlan-ng-devel] Bug#435008: linux-wlan-ng: not fail on modprobe if compiled-in p80211

[Tormod Volden]

Package: linux-wlan-ng
Version: 0.2.8+svn1832+dfsg-1
Severity: minor
Tags: patch


This change is used in Ubuntu and makes the package more robust in the 
case the kernel has the p80211 compiled in-kernel. It also changes the 
warning to say "module" instead of .ko or .o.

Not essential for Debian, but I would like to keep the Ubuntu delta 
minimal (or zero), and keep the package compatible with older 
kernels or systems where it doesn't cost anything.

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.22-1-486
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages linux-wlan-ng depends on:
ii  libc6                         2.6-4      GNU C Library: Shared libraries
ii  udev                          0.105-4    /dev/ and hotplug management daemo
ii  wireless-tools                29~pre22-1 Tools for manipulating Linux Wirel

Versions of packages linux-wlan-ng recommends:
ii  linux-wlan-ng-doc   0.2.8+svn1832+dfsg-1 documentation for wlan-ng

-- no debconf information
-------------- next part --------------
--- linux-wlan-ng-pre-up.orig.tormod	2007-07-28 13:10:31.000000000 +0200
+++ linux-wlan-ng-pre-up	2007-07-28 14:07:23.000000000 +0200
@@ -84,8 +84,8 @@ if [ -z "$IF_WIRELESS_CHANNEL" ]; then
 	IF_WIRELESS_CHANNEL=1
 fi
 
-if ! modprobe p80211; then
-	echo "Failed to load p80211.o." >&2
+if [ ! -d /proc/net/p80211 ] && ! modprobe p80211; then
+	echo "Failed to load the p80211 module." >&2
 	exit 1
 fi