--- a/usr/src/cmd/distro_const/utils/grub_setup.py Sat Jan 17 18:14:50 1970 +0800
+++ b/usr/src/cmd/distro_const/utils/grub_setup.py Wed Dec 17 12:02:21 2008 -0500
@@ -135,7 +135,7 @@
entries = []
-# The following three entries are the standard "hardwired" entries.
+# The following entries are the standard "hardwired" entries.
entry = []
entry.append("title " + release)
@@ -144,6 +144,12 @@
entries.append(entry)
entry = []
+entry.append("title " + release + " VESA driver")
+entry.append("\tkernel$ /platform/i86pc/kernel/$ISADIR/unix -B livemode=vesa")
+entry.append("\tmodule /boot/x86.microroot")
+entries.append(entry)
+
+entry = []
entry.append("title " + release + " text console")
entry.append("\tkernel$ /platform/i86pc/kernel/$ISADIR/unix -B livemode=text")
entry.append("\tmodule /boot/x86.microroot")
--- a/usr/src/cmd/slim-install/svc/live-fs-root Sat Jan 17 18:14:50 1970 +0800
+++ b/usr/src/cmd/slim-install/svc/live-fs-root Wed Dec 17 12:02:21 2008 -0500
@@ -153,8 +153,7 @@
. /lib/svc/share/fs_include.sh
-if [ $LIVECD = 1 -o $AUTOINSTALL = 1 ]
-then
+if [ $LIVECD = 1 -o $AUTOINSTALL = 1 ]; then
#
# Remount root RW
#
@@ -179,8 +178,7 @@
ls -lR /devices/* > /dev/null
fi
-if [ $LIVECD = 1 ]
-then
+if [ $LIVECD = 1 ]; then
volumeid=`cat /.volumeid`
echo "\rPreparing live image for use" >/dev/msglog
@@ -258,8 +256,7 @@
MOUNTED=1
echo "Done mounting Live image" > /dev/msglog
-elif [ $AUTOINSTALL = 1 ]
-then
+elif [ $AUTOINSTALL = 1 ]; then
echo "Preparing automated install image for use" > /dev/msglog
# Prime the network
@@ -520,6 +517,7 @@
if [ "$livemode" = "text" ]; then
/usr/sbin/svcadm disable -t application/graphical-login/gdm
else
+ [ "$livemode" = "vesa" ] && cp /.cdrom/jack/xorg.conf.vesa /etc/X11/xorg.conf
/usr/sbin/svcadm enable application/graphical-login/gdm
fi
--- a/usr/src/cmd/slim-install/user/jack/Makefile Sat Jan 17 18:14:50 1970 +0800
+++ b/usr/src/cmd/slim-install/user/jack/Makefile Wed Dec 17 12:02:21 2008 -0500
@@ -25,7 +25,7 @@
#
JACKCONFIGAUTOFILESRC = iotrace.desktop
-JACKFILESRC644 = xscreensaver install-icon.png
+JACKFILESRC644 = xscreensaver install-icon.png xorg.conf.vesa
JACKFILESRC755 = Xclients local.bashrc local.profile
JACKDESKTOPFILESRC = install_opensolaris.desktop ddu.desktop \
getting_started.desktop .os-icons-installed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/slim-install/user/jack/xorg.conf.vesa Wed Dec 17 12:02:21 2008 -0500
@@ -0,0 +1,101 @@
+Section "ServerLayout"
+ Identifier "X.org Configured"
+ Screen 0 "Screen0" 0 0
+ InputDevice "Mouse0" "CorePointer"
+ InputDevice "Keyboard0" "CoreKeyboard"
+EndSection
+
+Section "Files"
+ RgbPath "/usr/X11/lib/X11/rgb"
+ ModulePath "/usr/X11/lib/modules"
+ FontPath "/usr/X11/lib/X11/fonts/TrueType/"
+ FontPath "/usr/X11/lib/X11/fonts/Type1/"
+ FontPath "/usr/X11/lib/X11/fonts/Type1/sun/"
+ FontPath "/usr/X11/lib/X11/fonts/F3bitmaps/"
+ FontPath "/usr/X11/lib/X11/fonts/misc/"
+ FontPath "/usr/X11/lib/X11/fonts/100dpi/"
+ FontPath "/usr/X11/lib/X11/fonts/75dpi/"
+EndSection
+
+Section "Module"
+ Load "GLcore"
+ Load "IA"
+ Load "dbe"
+ Load "dri"
+ Load "extmod"
+ Load "record"
+ Load "xtrap"
+ Load "freetype"
+EndSection
+
+Section "InputDevice"
+ Identifier "Keyboard0"
+ Driver "kbd"
+EndSection
+
+Section "InputDevice"
+ Identifier "Mouse0"
+ Driver "mouse"
+ Option "Protocol" "auto"
+ Option "Device" "/dev/mouse"
+ Option "ZAxisMapping" "4 5 6 7"
+EndSection
+
+Section "Monitor"
+ Identifier "Monitor0"
+ VendorName "Monitor Vendor"
+ ModelName "Monitor Model"
+EndSection
+
+Section "Device"
+ ### Available Driver options are:-
+ ### Values: <i>: integer, <f>: float, <bool>: "True"/"False",
+ ### <string>: "String", <freq>: "<f> Hz/kHz/MHz"
+ ### [arg]: arg optional
+ #Option "SWcursor" # [<bool>]
+ #Option "HWcursor" # [<bool>]
+ #Option "NoAccel" # [<bool>]
+ #Option "ShadowFB" # [<bool>]
+ #Option "UseFBDev" # [<bool>]
+ #Option "Rotate" # [<str>]
+ #Option "VideoKey" # <i>
+ #Option "FlatPanel" # [<bool>]
+ #Option "FPDither" # [<bool>]
+ #Option "CrtcNumber" # <i>
+ #Option "FPScale" # [<bool>]
+ #Option "FPTweak" # <i>
+ #Option "DualHead" # [<bool>]
+ Identifier "Card0"
+ Driver "vesa"
+EndSection
+
+Section "Screen"
+ Identifier "Screen0"
+ Device "Card0"
+ Monitor "Monitor0"
+ SubSection "Display"
+ Viewport 0 0
+ Depth 1
+ EndSubSection
+ SubSection "Display"
+ Viewport 0 0
+ Depth 4
+ EndSubSection
+ SubSection "Display"
+ Viewport 0 0
+ Depth 8
+ EndSubSection
+ SubSection "Display"
+ Viewport 0 0
+ Depth 15
+ EndSubSection
+ SubSection "Display"
+ Viewport 0 0
+ Depth 16
+ EndSubSection
+ SubSection "Display"
+ Viewport 0 0
+ Depth 24
+ EndSubSection
+EndSection
+
--- a/usr/src/pkgdefs/SUNWslim-utils/prototype_com Sat Jan 17 18:14:50 1970 +0800
+++ b/usr/src/pkgdefs/SUNWslim-utils/prototype_com Wed Dec 17 12:02:21 2008 -0500
@@ -48,6 +48,7 @@
f none sbin/listcd 555 root bin
d none jack 755 jack staff
f none jack/install-icon.png 644 jack staff
+f none jack/xorg.conf.vesa 644 jack staff
f none jack/.xscreensaver=jack/xscreensaver 644 jack staff
f none jack/.Xclients=jack/Xclients 755 jack staff
f none jack/.bashrc=jack/local.bashrc 755 jack staff