summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2006-09-29 18:56:42 +0000
committerChris Lumens <clumens@redhat.com>2006-09-29 18:56:42 +0000
commitfe78cf6167930a6273b07751339dab8a1d54d1f8 (patch)
tree35a5f8e658c99b718ecf0a82fbdc72198aa8505a
parent4d7f34b66d6c04319122d277813f98cdc4082c77 (diff)
downloadanaconda-fe78cf6167930a6273b07751339dab8a1d54d1f8.tar.gz
anaconda-fe78cf6167930a6273b07751339dab8a1d54d1f8.tar.xz
anaconda-fe78cf6167930a6273b07751339dab8a1d54d1f8.zip
Only set graphical display mode if VNC is enabled in kickstart, not just if
it's a kickstart install.
-rw-r--r--ChangeLog5
-rwxr-xr-xanaconda4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e67ab0b7..cfec69901 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-29 Chris Lumens <clumens@redhat.com>
+
+ * anaconda: Only set graphical display mode if VNC is enabled in
+ kickstart, not just if it's a kickstart install.
+
2006-09-29 Jeremy Katz <katzj@redhat.com>
* iw/netconfig_dialog.py (NetworkConfigurator._ok): I can't type.
diff --git a/anaconda b/anaconda
index d41b29ec7..d879ecc3a 100755
--- a/anaconda
+++ b/anaconda
@@ -725,7 +725,9 @@ if __name__ == "__main__":
if opts.ksfile:
anaconda.isKickstart = True
vncksdata = setVNCFromKickstart(opts)
- opts.display_mode = 'g'
+
+ if vncksdata["enabled"]:
+ opts.display_mode = 'g'
#
# Determine install method - GUI or TUI