get pcic from command line, don't probe for it ourself

1 files changed, 3 insertions, 20 deletions

diff --git a/pcmcia.py b/pcmcia.py
index 61ccc587c..785b10dba 100755
--- a/pcmcia.py
+++ b/pcmcia.py
@@ -1,27 +1,10 @@
 #!/usr/bin/python
 
-import iutil, string, os
+import iutil, string, os, kudzu
 
-def pcicType(test = 0):
-    loc = "/sbin/probe"
-    if not os.access(loc, os.X_OK):
-	loc = "/usr/sbin/probe"
-
-    try:
-        result = iutil.execWithCapture(loc, [ loc ])
-    except RuntimeError:
-        return None
-
-    if (string.find(result, "TCIC-2 probe: not found") != -1):
-	return None
-    elif (string.find(result, "TCIC-2") != -1):
-	return "tcic"
-
-    return "i82365"
-
-def createPcmciaConfig(path, test = 0):
+def createPcmciaConfig(path, pcic, test = 0):
     f = open(path, "w")
-    pcic = pcicType(test = test)
+
     if (pcic):
 	f.write("PCMCIA=yes\n")
 	f.write("PCIC=%s\n" % (pcic,))