Removing etch compatibility.

diff --git a/scripts/init-premount/select_eth_device b/scripts/init-premount/select_eth_device
index 4323880..4803314 100755 (executable)
--- a/scripts/init-premount/select_eth_device
+++ b/scripts/init-premount/select_eth_device
@@ -36,16 +36,8 @@ if [ "$bootconf" != "BOOT=nfs" ] && [ "$NETBOOT" = "" ]; then
 fi
 
 # be sure this has been run (*should* be done by scripts/init-premount/udev)
-if [ -x /sbin/udevadm ]
-then
-       # lenny
-       udevadm trigger
-       udevadm settle
-else
-       # etch
-       udevtrigger
-       udevsettle
-fi
+udevadm trigger
+udevadm settle
 
 # we want to do some basic IP
 modprobe -q af_packet

diff --git a/scripts/live b/scripts/live
index f79eaff..96ab63a 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -762,16 +762,8 @@ do_netmount ()
 
        modprobe -q af_packet # For DHCP
 
-       if [ -x /sbin/udevadm ]
-       then
-               # lenny
-               udevadm trigger
-               udevadm settle
-       else
-               # etch
-               udevtrigger
-               udevsettle
-       fi
+       udevadm trigger
+       udevadm settle
 
        ipconfig ${DEVICE} | tee /netboot.config
 
@@ -1232,16 +1224,8 @@ setup_unionfs ()
                                modprobe -q -b ${module}
                        done
 
-                       if [ -x /sbin/udevadm ]
-                       then
-                               # lenny
-                               udevadm trigger
-                               udevadm settle
-                       else
-                               # etch
-                               udevtrigger
-                               udevsettle
-                       fi
+                       udevadm trigger
+                       udevadm settle
 
                        # For some reason, udevsettle does not block in this scenario,
                        # so we sleep for a little while.

diff --git a/scripts/live-bottom/21xvidemode b/scripts/live-bottom/21xvidemode
index 1312530..3fb9190 100755 (executable)
--- 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 (executable)
--- 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

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 6edd51c..1b4286d 100644 (file)
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -191,14 +191,7 @@ setup_loop ()
 
        modprobe -q -b "${module}"
 
-       if [ -x /sbin/udevadm ]
-       then
-               # lenny
-               udevadm settle
-       else
-               # etch
-               udevsettle
-       fi
+       udevadm settle
 
        for loopdev in ${pattern}
        do