default to GUI

1 files changed, 107 insertions, 8 deletions

diff --git a/anaconda b/anaconda
index f5b9c41ec..7ea7446ce 100755
--- a/anaconda
+++ b/anaconda
@@ -22,6 +22,7 @@ debug = 0
 rootPath = '/mnt/sysimage'
 localInstall = 0
 forceMount = 0
+mode = 'g'
 
 for n in args:
     (str, arg) = n
@@ -54,12 +55,12 @@ if (os.path.exists('rpmmodule')):
     sys.path.append('rpmmodule')
     sys.path.append('isys')
 elif (mode == None):
-    try:
-        f = open('/dev/fb0', 'r')
-	f.close()
-	mode = 'g'
-    except:
-	mode = 't'
+#      try:
+#          f = open('/dev/fb0', 'r')
+#  	f.close()
+#  	mode = 'g'
+#      except:
+#  	mode = 't'
 
 # imports after setting up the path
 from image import InstallMethod
@@ -77,12 +78,110 @@ if (mode == 'g' and not os.environ.has_key('DISPLAY')):
 	f.close()
         serverPath = '/usr/X11R6/bin/XF86_FBDev'
     except:
-	serverPath = '/usr/X11R6/bin/XF86_VGA16'
+#	serverPath = '/usr/X11R6/bin/XF86_VGA16'
+	serverPath = '/usr/X11R6/bin/XF86_SVGA'
+
+    isys.makeDevInode("psaux", "/tmp/psaux")
+
+    f = open ('/tmp/XF86Config', 'w')
+    f.write ("""
+Section "Files"
+    RgbPath	"/usr/X11R6/lib/X11/rgb"
+    FontPath	"/usr/X11R6/lib/X11/fonts/misc/"
+    FontPath	"/usr/X11R6/lib/X11/fonts/Type1/"
+    FontPath	"/usr/X11R6/lib/X11/fonts/Speedo/"
+    FontPath	"/usr/X11R6/lib/X11/fonts/75dpi/"
+    FontPath	"/usr/X11R6/lib/X11/fonts/100dpi/"
+EndSection
+
+Section "ServerFlags"
+EndSection
+
+Section "Keyboard"
+    Protocol    "Standard"
+    AutoRepeat  500 5
+    LeftAlt     Meta
+    RightAlt    Meta
+    ScrollLock  Compose
+    RightCtl    Control
+    XkbKeymap       "xfree86(us)"
+    XkbKeycodes     "xfree86"
+    XkbTypes        "default"
+    XkbCompat       "default"
+    XkbSymbols      "us(pc101)"
+    XkbGeometry     "pc"
+    XkbRules        "xfree86"
+    XkbModel        "pc101"
+    XkbLayout       "us"
+EndSection
+
+Section "Pointer"
+    Protocol    "ps/2"
+    Device      "/tmp/psaux"
+    Emulate3Buttons
+    Emulate3Timeout    50
+EndSection
+
+Section "Monitor"
+    Identifier  "Monitor"
+    VendorName  "Vendor"
+    ModelName   "Model"
+    HorizSync   31.5 - 79.0
+    VertRefresh 40-150
+
+# XXX fix me descr
+Modeline "640x480"     25.175 640  664  760  800   480  491  493  525
+# 640x480 @ 72 Hz, 36.5 kHz hsync
+Modeline "640x480"     31.5   640  680  720  864   480  488  491  521
+# 640x480 @ 75 Hz, 37.50 kHz hsync
+ModeLine  "640x480"    31.5   640  656  720  840   480  481  484  500 -HSync -VSync
+
+EndSection
+
+Section "Device"
+    Identifier  "Device"
+    VendorName  "Vendor"
+    BoardName   "Board"
+EndSection
+
+Section "Screen"
+    Driver      "vga16"
+    Device      "Device"
+    Monitor     "Monitor"
+    Subsection "Display"
+        Modes       "640x480"
+        ViewPort    0 0
+    EndSubsection
+EndSection
+
+Section "Screen"
+    Driver      "svga"
+    Device      "Device"
+    Monitor     "Monitor"
+    Subsection "Display"
+        Depth       8
+        Modes       "640x480"
+        ViewPort    0 0
+        Virtual     640 480
+    EndSubsection
+EndSection
+
+Section "Screen"
+    Driver      "fbdev"
+    Device      "Device"
+    Monitor     "Monitor"
+    Subsection "Display"
+	Depth 	    16
+        Modes       "default"
+    EndSubsection
+EndSection
+""")
+    f.close ()
 
     server = os.fork()
     if (not server):
 	os.execv(serverPath, [serverPath, ':1', '-xf86config', 
-                 imagepath + '/RedHat/instimage/etc/X11/XF86Config'])
+                 '/tmp/XF86Config'])
     child = os.fork()
     if (child):
 	os.waitpid(child, 0)