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

4 files changed, 1 insertions, 256 deletions

diff --git a/scripts/live b/scripts/live
index 6f04b86..37c3abd 100755
--- a/scripts/live
+++ b/scripts/live
@@ -51,14 +51,11 @@ Arguments ()
 		case "${ARGUMENT}" in
 			skipconfig)
 				NOACCESSIBILITY="Yes"
-				NOAUTOLOGIN="Yes"
-				NOCONSOLEKEYBOARD="Yes"
 				NOFASTBOOT="Yes"
 				NOFSTAB="Yes"
 				NONETWORKING="Yes"
-				NOXAUTOCONFIG="Yes"
 
-				export NOACCESSIBILITY NOAUTOLOGIN NOCONSOLEKEYBOARD NOFASTBOOT NOFSTAB NONETWORKING NOXAUTOCONFIG
+				export NOACCESSIBILITY NOFASTBOOT NOFSTAB NONETWORKING
 				;;
 
 			access=*)
@@ -243,11 +240,6 @@ Arguments ()
 				export SWAPON
 				;;
 
-			noxautoconfig)
-				NOXAUTOCONFIG="Yes"
-				export NOXAUTOCONFIG
-				;;
-
 			persistent)
 				PERSISTENT="Yes"
 				export PERSISTENT
@@ -351,21 +343,6 @@ Arguments ()
 				UNIONTYPE="${ARGUMENT#union=}"
 				export UNIONTYPE
 				;;
-
-			xdebconf)
-				XDEBCONF="Yes"
-				export XDEBCONF
-				;;
-
-			xdriver=*)
-			        XDRIVER="${ARGUMENT#xdriver=}"
-				export XDRIVER
-				;;
-
-			xvideomode=*)
-				XVIDEOMODE="${ARGUMENT#xvideomode=}"
-				export XVIDEOMODE
-				;;
 		esac
 	done
 
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
diff --git a/scripts/live-bottom/21xdriver b/scripts/live-bottom/21xdriver
deleted file mode 100755
index 92bbd4f..0000000
--- a/scripts/live-bottom/21xdriver
+++ /dev/null
@@ -1,56 +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}" ] || [ ! -x /root/usr/bin/X ] || [ -z "${XDRIVER}" ]
-then
-	exit 0
-fi
-
-. /scripts/live-functions
-
-log_begin_msg "Configuring X video driver"
-
-# live-boot script
-
-. /live.vars
-
-mount -o bind /sys /root/sys
-mount -o bind /proc /root/proc
-mount -o bind /dev /root/dev
-
-if [ "${XDRIVER}" != "dexconf" ]
-then
-
-chroot /root debconf-communicate -fnoninteractive live-boot > /dev/null << EOF
-set xserver-xorg/autodetect_video_card false
-set xserver-xorg/config/device/driver ${XDRIVER}
-EOF
-
-fi
-
-chroot /root dexconf
-
-umount /root/sys
-umount /root/proc
-umount /root/dev
-
-log_end_msg
diff --git a/scripts/live-bottom/21xvidemode b/scripts/live-bottom/21xvidemode
deleted file mode 100755
index ac28fad..0000000
--- a/scripts/live-bottom/21xvidemode
+++ /dev/null
@@ -1,55 +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
-
-if [ ! -x /root/usr/bin/X ]
-then
-	exit 0
-fi
-
-[ -n "$XVIDEOMODE" ] || exit
-
-. /scripts/live-functions
-
-log_begin_msg "Configuring X video modes"
-
-# live-boot script
-
-. /live.vars
-
-if [ "${XVIDEOMODE}" = "auto" ]
-then
-	rm -f /root/etc/X11/Xsession.d/21xvidemode
-
-	exit 0
-fi
-
-if [ -x "$(which xrandr 2>/dev/null)" ]
-then
-	echo "xrandr -s ${XVIDEOMODE} || /bin/true" >> /root/etc/X11/Xsession.d/21xvidemode
-fi
-
-log_end_msg