reverted to anaconda reprobing for the pcic

1 files changed, 12 insertions, 4 deletions

diff --git a/pcmcia.py b/pcmcia.py
index 99d9b6bcc..25a8de138 100755
--- a/pcmcia.py
+++ b/pcmcia.py
@@ -1,8 +1,12 @@
 #!/usr/bin/python
 
-import iutil, string, os
+import iutil, string, os, kudzu
+
+def pcicType(test = 0):
+    devs = kudzu.probe(kudzu.CLASS_SOCKET, kudzu.BUS_PCI, 0)
+    if devs:
+	return "yenta_socket"
 
-def hasPcmcia(test = 0):
     loc = "/sbin/probe"
     if not os.access(loc, os.X_OK):
 	loc = "/usr/sbin/probe"
@@ -14,12 +18,16 @@ def hasPcmcia(test = 0):
 
     if (string.find(result, "TCIC-2 probe: not found") != -1):
 	return None
+    elif (string.find(result, "TCIC-2") != -1):
+	return "tcic"
 
-    return 1
+    return "i82365"
 
-def createPcmciaConfig(path, pcic, test = 0):
+def createPcmciaConfig(path, test = 0):
     f = open(path, "w")
 
+    pcic = pcicType(test = test)
+
     if (pcic):
 	f.write("PCMCIA=yes\n")
 	f.write("PCIC=%s\n" % (pcic,))