summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Sivak <msivak@redhat.com>2012-10-16 12:48:16 +0200
committerMartin Sivak <msivak@redhat.com>2012-10-16 13:07:50 +0200
commit8580fde007d483f0e45a453b058f29b2a09d0c54 (patch)
treeb68d3dedd9c00aff8ba734eb12876193380f1e46
parent114f158eeb6518d9bdf5b6dda26dcdc209c658bb (diff)
downloadanaconda-8580fde007d483f0e45a453b058f29b2a09d0c54.tar.gz
anaconda-8580fde007d483f0e45a453b058f29b2a09d0c54.tar.xz
anaconda-8580fde007d483f0e45a453b058f29b2a09d0c54.zip
Fix threading initialization
-rwxr-xr-xanaconda6
1 files changed, 4 insertions, 2 deletions
diff --git a/anaconda b/anaconda
index 39fa0658b..5a3611b90 100755
--- a/anaconda
+++ b/anaconda
@@ -887,6 +887,10 @@ if __name__ == "__main__":
else:
log.error("Unknown method: %s", (anaconda.methodstr,))
+ # init threading before Gtk can do anything
+ from pyanaconda.threads import initThreading, threadMgr, AnacondaThread
+ initThreading()
+
# now start the interface
setupDisplay(anaconda, opts)
@@ -935,13 +939,11 @@ if __name__ == "__main__":
from pyanaconda.storage import storageInitialize
from pyanaconda.packaging import payloadInitialize
from pyanaconda.network import networkInitialize
- from pyanaconda.threads import initThreading, threadMgr, AnacondaThread
if anaconda.rescue:
from pyanaconda.rescue import doRescue
doRescue(anaconda.rescue_mount, ksdata, anaconda.platform)
- initThreading()
threadMgr.add(AnacondaThread(name="AnaStorageThread", target=storageInitialize, args=(anaconda.storage, ksdata, anaconda.protected)))
threadMgr.add(AnacondaThread(name="AnaPayloadThread", target=payloadInitialize, args=(anaconda.storage, ksdata, anaconda.payload)))
# TODO start dhcp in thread if we have no connection