Removing xconfig, xdriver, and xvideomode scripts, live-config takes care about that now.

1 files changed, 0 insertions, 121 deletions

diff --git a/scripts/live-bottom/20xconfig b/scripts/live-bottom/20xconfig
deleted file mode 100755
index abd9661..0000000
--- a/scripts/live-bottom/20xconfig
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/sh
-
-#set -e
-
-# initramfs-tools header
-
-PREREQ=""
-
-prereqs()
-{
-	echo "${PREREQ}"
-}
-
-case "${1}" in
-	prereqs)
-		prereqs
-		exit 0
-		;;
-esac
-
-# live-boot header
-
-if [ -n "${NOXAUTOCONFIG}" ]
-then
-	exit 0
-fi
-
-. /scripts/live-functions
-
-# live-boot script
-
-if [ -n "${TEXTONLY}" ]
-then
-	exit 0
-fi
-
-if [ ! -x /root/usr/bin/X ]
-then
-	exit 0
-fi
-
-log_begin_msg "Configuring X"
-
-if ! grep -q xforcevesa /proc/cmdline 2>&1 >/dev/null
-then
-	if [ "${TERM_TYPE}" = "serial" ]
-	then
-		# Don't bother trying to configure or start X on a serial
-		# console
-		rm -f /root/etc/rc?.d/S??[gkx]dm
-		exit 0
-	fi
-
-	locale=en_US.UTF-8
-
-	mount -o bind /sys /root/sys
-	mount -o bind /proc /root/proc
-	mount -o bind /dev /root/dev
-
-	if [ -n "${XDEBCONF}" -a -x /root/usr/sbin/xdebconfigurator ]
-	then
-		# xdebconfigurator
-		chroot /root /usr/sbin/xdebconfigurator
-	fi
-
-	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
-
-	if [ -n "${KLAYOUT}" ]
-	then
-		setlayout="set xserver-xorg/config/inputdevice/keyboard/layout ${KLAYOUT}"
-	fi
-
-chroot /root debconf-communicate -fnoninteractive live-boot > /dev/null << EOF
-${setlayout}
-${setvariant}
-${setmodel}
-${setoptions}
-EOF
-
-	live-reconfigure /root xserver-xorg 2>&1 \
-		| grep -v "overwriting possibly-customised configuration" \
-		| grep -v "file; backup in /etc/X11/xorg.conf"
-
-	umount /root/sys
-	umount /root/proc
-	umount /root/dev
-else
-
-cat > /root/etc/X11/xorg.conf << EOF
-Section "Device"
-	Identifier	"Configured Video Device"
-	Driver		"vesa"
-EndSection
-
-Section "Monitor"
-	Identifier	"Configured Monitor"
-EndSection
-
-Section "Screen"
-	Identifier	"Default Screen"
-	Monitor		"Configured Monitor"
-	Device		"Configured Video Device"
-EndSection
-EOF
-
-fi
-
-log_end_msg