From 408590f0d49ddfb9aaea8e120f0b0159d0ec6571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Mon, 4 Sep 2017 02:11:01 +0200 Subject: [PATCH] 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 2d3405de9ac0cc7d94b3b4f64590ad93d5ba7d54) --- anaconda/anaconda | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/anaconda/anaconda b/anaconda/anaconda index aa4604b..156e48e 100755 --- a/anaconda/anaconda +++ b/anaconda/anaconda @@ -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)