From 9c8ce90053dcfba57762413da4a310bcc5751de5 Mon Sep 17 00:00:00 2001 From: Mike Fulbright Date: Thu, 25 Sep 2003 22:05:13 +0000 Subject: retry mouse probe as per bug #105534 --- anaconda | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) (limited to 'anaconda') diff --git a/anaconda b/anaconda index 1ac466f01..5d0219e2a 100755 --- a/anaconda +++ b/anaconda @@ -840,13 +840,27 @@ if not isHeadless: # ask for the mouse type import rhpl.mouse as mouse - if mouse.mouseWindow(mousehw) == 0: - dup_log(_("No mouse was detected. A mouse is required for " - "graphical installation. Starting text mode.")) - display_mode = 't' - time.sleep(2) - else: - dup_log(_("Using mouse type: %s"), mousehw.shortDescription()) + while 1: + mouserc = mouse.mouseWindow(mousehw) + if mouserc == 0: + dup_log(_("No mouse was detected. A mouse is required for " + "graphical installation. Starting text mode.")) + display_mode = 't' + time.sleep(2) + break + elif mouserc == -1: + # rescan + mousehw.probe() + mousedev = mousehw.get() + if mousedev[0] != "No - mouse": + dup_log(_("Detected mouse type: %s"), mousehw.shortDescription()) + time.sleep(5) + break + else: + dup_log(_("Using mouse type: %s"), mousehw.shortDescription()) + break + + else: # s390/iSeries checks if display_mode == 'g' and not (os.environ.has_key('DISPLAY') or flags.usevnc): -- cgit