[SCM] live-boot branch, debian-next, updated. debian/3.0_a4-1-6-g67ee731

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 67ee73190745fe9bcfceaa9733cbb64fdeba3349
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Sep 6 13:56:14 2010 +0200

    Removing lenny legacy stuff from initscript.

diff --git a/debian/live-boot.init b/debian/live-boot.init
index 548abca..03bc390 100644
--- a/debian/live-boot.init
+++ b/debian/live-boot.init
@@ -83,8 +83,7 @@ device_is_USB_flash_drive()
 	[ "$(expr substr ${DEVICE} 1 2)" != "sd" ] && return 1
 
 	# check that the device is an USB device
-	if readlink /sys/block/${DEVICE} | grep -q usb ||
-	   readlink /sys/block/${DEVICE}/device | grep -q usb # linux < 2.6.29
+	if readlink /sys/block/${DEVICE} | grep -q usb
 	then
 		return 0
 	fi

-- 
live-boot