QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

anaconda: abort installation on X startup fail

Browse Source 
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)
This commit is contained in:
Marek Marczykowski-Górecki 2017-09-04 02:11:01 +02:00
parent 7bbc01a7f2
commit 408590f0d4
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
anaconda/anaconda
View File

@ -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)