[master/rhel7(.1)] Check xconfig before setting the installed displaymode (#1081768)
David Shea
dshea at redhat.com
Sun Mar 30 14:45:56 UTC 2014
Resolves: rhbz#1081768
---
anaconda | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/anaconda b/anaconda
index 42af682..b289554 100755
--- a/anaconda
+++ b/anaconda
@@ -1030,8 +1030,10 @@ if __name__ == "__main__":
setupDisplay(anaconda, opts, addon_paths)
# if we're in text mode, the resulting system should be too
+ # ...unless the kickstart specified otherwise
if anaconda.displayMode != 'g':
- anaconda.ksdata.skipx.skipx = True
+ if not anaconda.ksdata.xconfig.seen:
+ anaconda.ksdata.skipx.skipx = True
from pyanaconda.constants import DISPLAY_MODE_CMDLINE, DISPLAY_MODE_TEXT
if anaconda.displayMode == 'c':
anaconda.ksdata.displaymode.displayMode = DISPLAY_MODE_CMDLINE
--
1.8.5.3
More information about the anaconda-patches
mailing list