diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-03-14 05:32:42 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-03-14 05:32:42 +0000 |
| commit | 2b2e698edac92e777f3495b3067fc9e317a19833 (patch) | |
| tree | 6cd39446eef238e2a7e7d9d3ba7d0f9f83bdf7a8 | |
| parent | e827370f88da0887bf7cce30632b886b44bba296 (diff) | |
| download | anaconda-2b2e698edac92e777f3495b3067fc9e317a19833.tar.gz anaconda-2b2e698edac92e777f3495b3067fc9e317a19833.tar.xz anaconda-2b2e698edac92e777f3495b3067fc9e317a19833.zip | |
move some stuff around so that we only import xsetup and xhwstate if
we're going to do probing.
| -rwxr-xr-x | anaconda | 23 |
1 files changed, 12 insertions, 11 deletions
@@ -207,6 +207,15 @@ progmode = 'install' # 'rescue', or 'install' method = None # URL representation of install method logFile = None # may be a file object or a file name +# should we ever try to probe for X stuff? this will give us a convenient +# out eventually to circumvent all probing and just fall back to text mode +# on hardware where we break things if we probe +doXProbe = 1 + +# probing for hardware on an s390 seems silly... +if iutil.getArch() == "s390": + doXProbe = 0 + # # xcfg - xserver info (?) # mousehw - mouseinfo info @@ -341,9 +350,10 @@ if (debug): import isys import instdata import floppy -import xsetup -import rhpl.xhwstate as xhwstate +if doXProbe: + import xsetup + import rhpl.xhwstate as xhwstate import rhpl.keyboard as keyboard # handle traceonly and exit @@ -453,15 +463,6 @@ if os.environ.has_key('DISPLAY') and display_mode == 'g': else: x_already_set = 0 -# should we ever try to probe for X stuff? this will give us a convenient -# out eventually to circumvent all probing and just fall back to text mode -# on hardware where we break things if we probe -doXProbe = 1 - -# probing for hardware on an s390 seems silly... -if iutil.getArch() == "s390": - doXProbe = 0 - if doXProbe: # # Probe what is available for X and setup a hardware state |