anaconda: abort installation on X startup fail

Do not fallback to text mode, which cannot property install the system
without kickstart file (missing LUKS passphrase prompt).

Fixes QubesOS/qubes-issues#2996

(cherry picked from commit 2d3405de9a)
pull/19/head
Marek Marczykowski-Górecki 7 years ago
parent 7bbc01a7f2
commit 408590f0d4
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724

@ -674,10 +674,13 @@ def setupDisplay(anaconda, options, addons=None):
doStartupX11Actions()
except (OSError, RuntimeError) as e:
log.warning("X startup failed: %s", e)
stdoutLog.warning("X startup failed, falling back to text mode")
anaconda.displayMode = 't'
graphical_failed = 1
time.sleep(2)
stdoutLog.warning("X startup failed, aborting installation")
stdoutLog.error("X startup failed, aborting installation")
print(_("The installation cannot continue and the system will be rebooted"))
print(_("Press ENTER to continue"))
input()
iutil.ipmi_report(constants.IPMI_ABORTED)
sys.exit(1)
if not graphical_failed:
doExtraX11Actions(options.runres)

Loading…
Cancel
Save