diff options
| -rwxr-xr-x | anaconda | 5 | ||||
| -rw-r--r-- | loader/loader.c | 5 | ||||
| -rwxr-xr-x | pcmcia.py | 16 | ||||
| -rw-r--r-- | todo.py | 7 |
4 files changed, 16 insertions, 17 deletions
@@ -135,7 +135,6 @@ kickstart = None mouseInfo = None progmode = None customClass = None -pcicController = None # # parse off command line arguments @@ -154,8 +153,6 @@ for n in args: xmode = 1 elif (str == '-t' or str == '--test'): test = 1 - elif (str == '--pcic'): - pcicController = arg elif (str == '--overhead'): overhead = int(arg) elif (str == '--rescue'): @@ -504,7 +501,7 @@ todo = ToDo(intf, method, rootPath, installSystem = installPackages, setupFilesystems = setupFilesystems, mouse = mouseInfo, instClass = instClass, x = x, expert = expert, serial = serial, reconfigOnly = reconfigOnly, test = test, - extraModules = extraModules, pcicController = pcicController) + extraModules = extraModules) try: intf.run(todo, test = test) diff --git a/loader/loader.c b/loader/loader.c index 2ceb84074..0ed989369 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -2897,11 +2897,6 @@ int main(int argc, char ** argv) { *argptr++ = instClass; } - if (pcic[0]) { - *argptr++ = "--pcic"; - *argptr++ = pcic; - } - if (memoryOverhead) { *argptr++ = "--overhead"; *argptr = malloc(20); @@ -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,)) @@ -473,7 +473,7 @@ class ToDo: def __init__(self, intf, method, rootPath, setupFilesystems = 1, installSystem = 1, mouse = None, instClass = None, x = None, expert = 0, serial = 0, reconfigOnly = 0, test = 0, - extraModules = [], pcicController = None): + extraModules = []): self.intf = intf self.method = method self.hdList = None @@ -488,7 +488,6 @@ class ToDo: self.network = Network () self.rootpassword = Password () self.extraModules = extraModules - self.pcicController = pcicController self.verifiedState = None if mouse: @@ -1857,8 +1856,8 @@ class ToDo: # pcmcia is supported only on i386 at the moment if arch == "i386": pcmcia.createPcmciaConfig( - self.instPath + "/etc/sysconfig/pcmcia", - self.pcicController) + self.instPath + "/etc/sysconfig/pcmcia") + self.copyConfModules () if not self.x.skip and self.x.server: if os.access (self.instPath + "/etc/X11/X", os.R_OK): |