X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig.functions;h=a8eed747c4a7b6d81c60fc98094472265d1a448c;hp=84fd976d169183d9ca8d97711760fd2bafdd2d10;hb=bedf2f666c61164fc5688058aa9990f17883b621;hpb=b15ea38b6cb805e68c406b0ea4ac498c6d96e212 diff --git a/autoconfig.functions b/autoconfig.functions index 84fd976..a8eed74 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -667,18 +667,6 @@ fi } # }}} -# {{{ hardware detection via hwinfo -config_hwinfo(){ -if checkbootparam 'hwinfo' >>$DEBUG 2>&1; then - einfo "Discovering hardware via hwinfo:" - MODULES=$(su grml hwinfo | grep "Cmd: \"modprobe" | awk '{print $5}' | sed 's/"//') - echo -n " Loading modules: " - for i in `echo $MODULES` ; do echo -n $i && modprobe $i ; done - eend 0 -fi -} -# }}} - # {{{ blacklist specific module [ used in /etc/init.d/udev ] config_blacklist(){ if checkbootparam 'blacklist' ; then @@ -766,33 +754,6 @@ fi } # }}} -# {{{ PCMCIA Check/Setup -# This needs to be done before other modules are being loaded (by hwsetup) -config_pcmcia(){ -if checkbootparam 'nopcmcia'; then - ewarn "Skipping PCMCIA detection as requested on boot commandline." ; eend 0 -else - if /usr/sbin/laptop-detect ; then - einfo "Detected Laptop - checking for PCMCIA." && eend 0 - modprobe pcmcia_core >>$DEBUG 2>&1 - # Try Cardbus or normal PCMCIA socket drivers - modprobe yenta_socket >>$DEBUG 2>&1 || modprobe i82365 >>$DEBUG 2>&1 || modprobe pd6729 >>$DEBUG 2>&1 || modprobe tcic >>$DEBUG 2>&1 - if [ "$?" = "0" ]; then - modprobe ds >>$DEBUG 2>&1 - if [ -d /proc/bus/pccard ] ; then - if [ -x /sbin/cardmgr ] ; then - einfo "PCMCIA found, starting cardmgr." - cardmgr >>$DEBUG 2>&1 && sleep 6 && eend 0 - else - eerror "No cardmgr found. Make sure package pcmciautils is installed, it should handle it instead." ; eend 1 - fi - fi - fi - fi -fi -} -# }}} - # {{{ run software synthesizer via speakup config_swspeak(){ if checkbootparam 'swspeak' ; then