[Debian-live-changes] r1343 - in dists/trunk/live-initramfs: doc scripts scripts/live-bottom

[Daniel Baumann]

Author: daniel
Date: 2007-05-07 08:05:13 +0000 (Mon, 07 May 2007)
New Revision: 1343

Added:
   dists/trunk/live-initramfs/scripts/live-bottom/19xvideomode
Modified:
   dists/trunk/live-initramfs/doc/ChangeLog
   dists/trunk/live-initramfs/scripts/live
Log:


Modified: dists/trunk/live-initramfs/doc/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/doc/ChangeLog	2007-05-07 08:04:54 UTC (rev 1342)
+++ dists/trunk/live-initramfs/doc/ChangeLog	2007-05-07 08:05:13 UTC (rev 1343)
@@ -1,8 +1,11 @@
 2007-05-07  Daniel Baumann  <daniel at debian.org>
 
 	* scripts/live-bottom/10adduser:
-	  - Applied patch from Ben Armstrong <synrg at debian.org> to write
+	  - Added patch from Ben Armstrong <synrg at debian.org> to write
 	    $HOME/.su-to-rootrc file.
+	* scripts/live, scripts/live-bottom/19xvideomode:
+	  - Added patch from Mathieu Geli <mathieu.geli at gmail.com> to have the
+	    ability to force X video mode from kernel append line.
 
 2007-05-06  Daniel Baumann  <daniel at debian.org>
 

Modified: dists/trunk/live-initramfs/scripts/live
===================================================================
--- dists/trunk/live-initramfs/scripts/live	2007-05-07 08:04:54 UTC (rev 1342)
+++ dists/trunk/live-initramfs/scripts/live	2007-05-07 08:05:13 UTC (rev 1343)
@@ -92,6 +92,8 @@
 		export KVARIANT=${x#*=} ;;
 	    kmodel=*|console-setup/modelcode=*)
 		export KMODEL=${x#*=} ;;
+	    xvideomode=*)
+		export XVIDEOMODE=${x#xvideomode=} ;;
 	    module=*)
 		export MODULE=${x#module=} ;;
 	    preseed/file=*|file=*)

Added: dists/trunk/live-initramfs/scripts/live-bottom/19xvideomode
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/19xvideomode	2007-05-07 08:04:54 UTC (rev 1342)
+++ dists/trunk/live-initramfs/scripts/live-bottom/19xvideomode	2007-05-07 08:05:13 UTC (rev 1343)
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+PREREQ=""
+DESCRIPTION="Configuring X kludges..."
+
+. /scripts/casper-functions
+
+prereqs()
+{
+	echo "$PREREQ"
+}
+
+case $1 in
+# get pre-requisites
+prereqs)
+	prereqs
+	exit 0
+	;;
+esac
+
+if [ -n "$XVIDEOMODE" ]
+then
+	log_begin_msg "$DESCRIPTION"
+
+	mount -n -o bind /sys /root/sys
+	mount -n -o bind /proc /root/proc
+	mount -n -o bind /dev /root/dev
+	mount -n -o bind /etc /root/dev
+
+chroot /root debconf-communicate -fnoninteractive casper > /dev/null <<EOF
+set xserver-xorg/config/monitor/mode-list ${XVIDEOMODE}
+set xserver-xorg/config/display/modes ${XVIDEOMODE}
+EOF
+
+	chroot /root dexconf
+
+	umount /root/sys
+	umount /root/proc
+	umount /root/dev
+
+	log_end_msg
+fi


Property changes on: dists/trunk/live-initramfs/scripts/live-bottom/19xvideomode
___________________________________________________________________
Name: svn:executable
   + *