From 85e2939c446d0ead490be57d0a0edac9f6a3f772 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Mon, 15 Mar 2010 07:30:07 +0100
Subject: Removing etch compatibility.

---
 scripts/live-bottom/21xvidemode  | 24 ++----------------------
 scripts/live-bottom/23networking | 12 ++----------
 2 files changed, 4 insertions(+), 32 deletions(-)

(limited to 'scripts/live-bottom')

diff --git a/scripts/live-bottom/21xvidemode b/scripts/live-bottom/21xvidemode
index 1312530..3fb9190 100755
--- a/scripts/live-bottom/21xvidemode
+++ b/scripts/live-bottom/21xvidemode
@@ -47,29 +47,9 @@ then
 	exit 0
 fi
 
-if [ $(cat /root/etc/debian_version | sed 's|\..*$||') -ge 4 ]
+if [ -x "$(which xrandr 2>/dev/null)" ]
 then
-	# lenny or newer
-	if [ -x "$(which xrandr 2>/dev/null)" ]
-	then
-		echo "xrandr -s ${XVIDEOMODE} || /bin/true" >> /root/etc/X11/Xsession.d/21xvidemode
-	fi
-else
-	# etch
-	mount -o bind /sys /root/sys
-	mount -o bind /proc /root/proc
-	mount -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
+	echo "xrandr -s ${XVIDEOMODE} || /bin/true" >> /root/etc/X11/Xsession.d/21xvidemode
 fi
 
 log_end_msg
diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
index 72aaf12..4ebb944 100755
--- a/scripts/live-bottom/23networking
+++ b/scripts/live-bottom/23networking
@@ -46,16 +46,8 @@ iface lo inet loopback
 
 EOF
 
-if [ -x /sbin/udevadm ]
-then
-	# lenny
-	udevadm trigger
-	udevadm settle
-else
-	# etch
-	udevtrigger
-	udevsettle
-fi
+udevadm trigger
+udevadm settle
 
 if [ -z "${NETBOOT}" -a -n "${STATICIP}" -a "${STATICIP}" != "frommedia" ]
 then
-- 
cgit v1.2.3