From 9c5890ba9edbbdd0c6229ab2a2d68e3dbf32bc64 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 25 Jul 2007 19:00:29 +0200 Subject: [PATCH] Add config_ipw3945() --- autoconfig | 3 ++- autoconfig.functions | 15 ++++++++++++++- autoconfig.small | 3 ++- debian/changelog | 7 +++++++ grml-autoconfig | 2 ++ 5 files changed, 27 insertions(+), 3 deletions(-) diff --git a/autoconfig b/autoconfig index 6373ab4..1e82864 100644 --- a/autoconfig +++ b/autoconfig @@ -3,7 +3,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Son Jul 01 20:35:13 CEST 2007 [mika] +# Latest change: Mit Jul 25 18:58:58 CEST 2007 [mika] ################################################################################ ################################################################################ @@ -80,6 +80,7 @@ CONFIG_HOTPLUG_AGENT='no' # deactivate specific hotplug agent(s) via bootpar CONFIG_HOTPLUG_BLACKLIST='no' # check for blacklist bootparam CONFIG_HOTPLUG_MAIN='no' # start hotplug system [should be handled by udev now] CONFIG_HWINFO='no' # run hwinfo for module-detection (requires bootparam 'hwinfo'!) +CONFIG_IPW3945='yes' # check for broken ipw3945 module CONFIG_INTERACTIVE='yes' # check for expert-mode as bootparam CONFIG_KERNEL='yes' # display information on running kernel CONFIG_LANGUAGE='yes' # allow language specification via commandline diff --git a/autoconfig.functions b/autoconfig.functions index 3956408..f63815a 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Klaus Knopper , (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Don Jul 12 15:33:48 CEST 2007 [mika] +# Latest change: Mit Jul 25 18:59:49 CEST 2007 [mika] ################################################################################ # {{{ path, variables, signals, umask, zsh @@ -2177,6 +2177,19 @@ fi } # }}} +# {{{ check for broken ipw3945 driver which causes problems (especially on hd install) +config_ipw3945() { + if grep -q ipw3945 /proc/modules ; then + if ! iwconfig 2>/dev/null| grep -q 'IEEE 802' ; then + ewarn "Broken ipw3945 network interface found, reloading module." + rmmod ipw3945 + modprobe ipw3945 + eend $? + fi + fi +} +# }}} + # {{{ disable console blanking config_blanking(){ if checkbootparam "noblank" ; then diff --git a/autoconfig.small b/autoconfig.small index c459169..c019bfe 100644 --- a/autoconfig.small +++ b/autoconfig.small @@ -3,7 +3,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Son Jul 01 20:35:11 CEST 2007 [mika] +# Latest change: Mit Jul 25 18:58:57 CEST 2007 [mika] ################################################################################ ################################################################################ @@ -80,6 +80,7 @@ CONFIG_HOTPLUG_AGENT='no' # deactivate specific hotplug agent(s) via bootpar CONFIG_HOTPLUG_BLACKLIST='no' # check for blacklist bootparam CONFIG_HOTPLUG_MAIN='no' # start hotplug system [should be handled by udev now] CONFIG_HWINFO='no' # run hwinfo for module-detection (requires bootparam 'hwinfo'!) +CONFIG_IPW3945='yes' # check for broken ipw3945 module CONFIG_INTERACTIVE='yes' # check for expert-mode as bootparam CONFIG_KERNEL='yes' # display information on running kernel CONFIG_LANGUAGE='yes' # allow language specification via commandline diff --git a/debian/changelog b/debian/changelog index 4a2e6d2..6af6ef6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +grml-autoconfig (0.7.10) unstable; urgency=low + + * Add config_ipw3945() which works around broken ipw3945 driver, + important especially for hd installation. + + -- Michael Prokop Wed, 25 Jul 2007 19:00:03 +0200 + grml-autoconfig (0.7.9) unstable; urgency=low * Support bootoption nogrmlacpi to disable acpi stuff inside diff --git a/grml-autoconfig b/grml-autoconfig index e9e692f..fdeb518 100755 --- a/grml-autoconfig +++ b/grml-autoconfig @@ -250,6 +250,8 @@ checkvalue $CONFIG_CREATE_MNT_DIRS && create_mnt_dirs checkvalue $CONFIG_915RESOLUTION && config_915resolution +checkvalue $CONFIG_IPW3945 && config_ipw3945 + checkvalue $CONFIG_AUTOMOUNT && config_automount checkvalue $CONFIG_DISTCC && config_distcc -- 2.1.4