From: Michael Prokop <mika@grml.org>
Date: Wed, 6 Jul 2011 22:36:46 +0000 (+0200)
Subject: Drop deprecated config_pcmcia().
X-Git-Tag: v0.9.30~5
X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=9af1e4e4607e9c516ecbe874e6688f13e6d3f93b

Drop deprecated config_pcmcia().

We don't run this function since ages, if we really
need and want it we should consider implementing it
inside udev rules so we don't support it in boot-time
only.
---

diff --git a/autoconfig b/autoconfig
index e8ef68e..df15957 100644
--- a/autoconfig
+++ b/autoconfig
@@ -92,7 +92,6 @@ CONFIG_NETSCRIPT='yes'        # download and run script/executable provided by b
 CONFIG_NETIPV6='yes'          # check for bootparam ipv6
 CONFIG_PARTCONF='yes'         # do we want partconf to work?
 CONFIG_PASSWD='yes'           # set password via bootparam passwd
-CONFIG_PCMCIA='no'            # check for pcmcia and start cardmgr
 CONFIG_SCRIPTS='yes'          # execute scripts from the scripts option
 CONFIG_SERVICES='yes'         # check for services to run, provided via bootparam
 CONFIG_SMALL='yes'            # use a less "bloat" /etc/inittab for small computer with less RAM
diff --git a/autoconfig.functions b/autoconfig.functions
index 84fd976..e69ab0d 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -766,33 +766,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
diff --git a/grml-autoconfig b/grml-autoconfig
index 1218043..e5abca7 100755
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -144,14 +144,12 @@ checkvalue $CONFIG_TESTCD && config_testcd
 
 checkvalue $CONFIG_HWINFO && config_hwinfo
 
+[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||">/dev/tty14
+
 checkvalue $CONFIG_MODULES && config_modules
 
 checkvalue $CONFIG_ACPI_APM && config_acpi_apm
 
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||">/dev/tty14
-
-checkvalue $CONFIG_PCMCIA && config_pcmcia
-
 [ -n "$SPLASH" ] &&  /usr/bin/grml-bootsplash "||||||">/dev/tty14
 
 checkvalue $CONFIG_BLIND && config_blind