[Debian-live-changes] r1483 - dists/trunk/live-initramfs/scripts/live-bottom

[Daniel Baumann]

Author: daniel
Date: 2007-05-11 22:31:09 +0000 (Fri, 11 May 2007)
New Revision: 1483

Added:
   dists/trunk/live-initramfs/scripts/live-bottom/181_xorg
   dists/trunk/live-initramfs/scripts/live-bottom/182_xvideomode
Removed:
   dists/trunk/live-initramfs/scripts/live-bottom/181_xvideomode
   dists/trunk/live-initramfs/scripts/live-bottom/182_xorg
Log:


Copied: dists/trunk/live-initramfs/scripts/live-bottom/181_xorg (from rev 1482, dists/trunk/live-initramfs/scripts/live-bottom/182_xorg)

Deleted: dists/trunk/live-initramfs/scripts/live-bottom/181_xvideomode
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/181_xvideomode	2007-05-11 22:26:39 UTC (rev 1482)
+++ dists/trunk/live-initramfs/scripts/live-bottom/181_xvideomode	2007-05-11 22:31:09 UTC (rev 1483)
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
-	echo "${PREREQ}"
-}
-
-case "${1}" in
-	prereqs)
-		prereqs
-		exit 0
-		;;
-esac
-
-DESCRIPTION="Configuring X kludges..."
-
-. /scripts/live-functions
-
-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
-
-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}
-EOF
-
-	chroot /root dexconf
-
-	umount /root/sys
-	umount /root/proc
-	umount /root/dev
-
-	log_end_msg
-fi

Deleted: dists/trunk/live-initramfs/scripts/live-bottom/182_xorg
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/182_xorg	2007-05-11 22:26:39 UTC (rev 1482)
+++ dists/trunk/live-initramfs/scripts/live-bottom/182_xorg	2007-05-11 22:31:09 UTC (rev 1483)
@@ -1,85 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
-	echo "${PREREQ}"
-}
-
-case "${1}" in
-	prereqs)
-		prereqs
-		exit 0
-		;;
-esac
-
-# xorg
-
-if [ "$TERM_TYPE" = "serial" ]
-then
-	# Don't bother trying to configure or start X on a serial console
-	rm -f /etc/rc?.d/S??[gxk]dm
-	exit 0
-fi
-
-DESCRIPTION="Configuring X..."
-
-. /scripts/live-functions
-
-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
-
-if [ -n "${XDEBCONF}" ] && [ -x /root/usr/sbin/xdebconfigurator ]
-then
-	# xdebconfigurator
-	chroot /root /usr/sbin/xdebconfigurator
-fi
-
-if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
-then
-
-chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
-set xserver-xorg/autodetect_keyboard true
-fset xserver-xorg/autodetect_keyboard seen true
-EOF
-
-else
-	# d-i code not present, so:
-	if [ -n "${KOPTIONS}" ]
-	then
-		setoptions="set xserver-xorg/config/inputdevice/keyboard/options ${KOPTIONS}"
-	fi
-
-	if [ -n "${KVARIANT}" ]
-	then
-		setvariant="set xserver-xorg/config/inputdevice/keyboard/variant ${KVARIANT}"
-	fi
-
-	if [ -n "${KMODEL}" ]
-	then
-		setmodel="set xserver-xorg/config/inputdevice/keyboard/model ${KMODEL}"
-	fi
-
-chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF
-set xserver-xorg/config/inputdevice/keyboard/layout ${kbd}
-${setvariant}
-${setmodel}
-${setoptions}
-EOF
-
-fi
-
-DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 live-reconfigure /root xserver-xorg
-umount /root/sys
-umount /root/proc
-umount /root/dev
-
-log_end_msg

Copied: dists/trunk/live-initramfs/scripts/live-bottom/182_xvideomode (from rev 1482, dists/trunk/live-initramfs/scripts/live-bottom/181_xvideomode)