[SCM] debian-live/live-initramfs branch, master, updated. 1.118-1-6-g5d38c26

Daniel Baumann daniel at debian.org
Fri Feb 29 11:05:51 UTC 2008


The following commit has been merged in the master branch:
commit 4da33cbe851266628749a6b82bbfc282851d079d
Author: Andrey Asadchev <asadchev at gmail.com>
Date:   Fri Feb 29 11:56:36 2008 +0100

    Explicitly set Xorg video driver.
    
    Xdriver is specifed with "xdriver=$(DRIVER)". This is because fglrx (and
    possibly other drivers) are not detected correctly.

diff --git a/scripts/live b/scripts/live
index 332de10..8db6b80 100755
--- a/scripts/live
+++ b/scripts/live
@@ -396,6 +396,11 @@ Arguments ()
 				export XDEBCONF
 				;;
 
+			xdriver=*)
+			        XDRIVER="${ARGUMENT#xdriver=}"
+				export XDRIVER
+				;;
+
 			xvideomode=*)
 				XVIDEOMODE="${ARGUMENT#xvideomode=}"
 				export XVIDEOMODE
diff --git a/scripts/live-bottom/21xvidemode b/scripts/live-bottom/21xdriver
similarity index 80%
copy from scripts/live-bottom/21xvidemode
copy to scripts/live-bottom/21xdriver
index a11dc77..c96f0ea 100755
--- a/scripts/live-bottom/21xvidemode
+++ b/scripts/live-bottom/21xdriver
@@ -31,15 +31,15 @@ log_begin_msg "Configuring X kludges..."
 
 # live-initramfs script
 
-if [ -n "$XVIDEOMODE" ]
+if [ -n "$XDRIVER" ]
 then
 	mount -n -o bind /sys /root/sys
 	mount -n -o bind /proc /root/proc
 	mount -n -o bind /dev /root/dev
 
 chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
-set xserver-xorg/config/monitor/mode-list ${XVIDEOMODE}
-set xserver-xorg/config/display/modes ${XVIDEOMODE}
+set xserver-xorg/autodetect_video_card false
+set xserver-xorg/config/device/driver ${XDRIVER}
 EOF
 
 	chroot /root dexconf
@@ -49,4 +49,3 @@ EOF
 	umount /root/dev
 fi
 
-log_end_msg

-- 
debian-live/live-initramfs



More information about the debian-live-changes mailing list