If the user requested text-mode or cmdline-mode it is not needed
to display a message about missing X (minstg2.img) or too little
memory.
Signed-off-by: Niels de Vos <niels.devos@xxxxxxxxxxxxxxxxxx>
---
This patch is against rhel5-base and tested with SRPM of
anaconda-11.1.2.168-1.el5.
anaconda | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/anaconda b/anaconda
index 58f3865..4ccc9a1 100755
--- a/anaconda
+++ b/anaconda
@@ -448,7 +448,7 @@ def checkMemory(opts):
# override display mode if machine cannot nicely run X
if not flags.test:
- if iutil.memInstalled() < isys.MIN_GUI_RAM:
+ if opts.display_mode == 'g' and iutil.memInstalled() < isys.MIN_GUI_RAM:
stdoutLog.warning(_("You do not have enough RAM to use the graphical "
"installer. Starting text mode."))
opts.display_mode = 't'
@@ -806,7 +806,7 @@ if __name__ == "__main__":
# now determine if we're going to run in GUI or TUI mode
#
# if no X server, we have to use text mode
- if not (flags.test or flags.rootpath) and (rhpl.getArch() != "s390" and not os.access("/mnt/runtime/usr/bin/Xorg", os.X_OK)):
+ if opts.display_mode == 'g' and not (flags.test or flags.rootpath) and (rhpl.getArch() != "s390" and not os.access("/mnt/runtime/usr/bin/Xorg", os.X_OK)):
stdoutLog.warning(_("Graphical installation not available... "
"Starting text mode."))
time.sleep(2)
--
1.5.5.6
Attachment:
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list
