summaryrefslogtreecommitdiffstats
path: root/anaconda
diff options
context:
space:
mode:
authorDavid Lehman <dlehman@redhat.com>2013-01-08 18:30:39 -0600
committerDavid Lehman <dlehman@redhat.com>2013-01-28 13:15:04 -0600
commitea9f0d7cfee26140f6244899b48ae2125688bbba (patch)
tree6f58cd9251d7aff2ff042fa51111847d9b72416c /anaconda
parente6522ec42778d6246445c67d46b0a3764e17b62a (diff)
downloadanaconda-ea9f0d7cfee26140f6244899b48ae2125688bbba.tar.gz
anaconda-ea9f0d7cfee26140f6244899b48ae2125688bbba.tar.xz
anaconda-ea9f0d7cfee26140f6244899b48ae2125688bbba.zip
Remove unused functions and move storage-specific utils to storage.
This is the first pass at setting things up to split storage out into a separate package. It replaces the guts of iutil.execWithRedirect and iutil.execWithCapture with a single backend function, _run_program. The main thing I can think of that might be cause for complaint is that _run_program does not log each output line as the external program outputs it, so you get the whole output buffer at once. Storage gets its own copy of _run_program and all of the calls in storage use the copy from storage.util. The reason I moved all of the iutil arch functions into storage is that they are mostly used in storage and I didn't want there to be two copies of the whole set. The rest is removing of unused things and moving of things only used by storage into storage.
Diffstat (limited to 'anaconda')
-rwxr-xr-xanaconda6
1 files changed, 4 insertions, 2 deletions
diff --git a/anaconda b/anaconda
index 032b35d60..ca4961db7 100755
--- a/anaconda
+++ b/anaconda
@@ -409,13 +409,15 @@ def setupDisplay(anaconda, opts, addon_paths=None):
from pyanaconda.ui.tui.spokes.askvnc import AskVNCSpoke
from pykickstart.constants import DISPLAY_MODE_TEXT
from pyanaconda import network
+ from pyanaconda.storage import arch
+ from pyanaconda.storage import util
graphical_failed = 0
vncS = vnc.VncServer() # The vnc Server object.
vncS.anaconda = anaconda
anaconda.displayMode = opts.display_mode
- anaconda.isHeadless = opts.isHeadless or iutil.isS390()
+ anaconda.isHeadless = opts.isHeadless or arch.isS390()
if opts.vnc:
flags.usevnc = 1
@@ -456,7 +458,7 @@ def setupDisplay(anaconda, opts, addon_paths=None):
vncS.vncconnectport = anaconda.ksdata.vnc.port
# disable VNC over text question when not enough memory is available
- if iutil.memInstalled() < isys.MIN_GUI_RAM:
+ if util.total_memory() < isys.MIN_GUI_RAM:
flags.vncquestion = False
# disable VNC question if text mode is requested and this is a ks install