[SCM] Debian Live initramfs hook branch, master, updated. 1.157.1-1-17-g7252f2c

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 7252f2cf1f4999fb1e97ee101690fa900ce847c1
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu May 14 09:53:42 2009 +0200

    Updating eject prevention for USB devices in initscripts for linux 2.6.29 and newer.

diff --git a/debian/live-initramfs.init b/debian/live-initramfs.init
index e4e46d5..f7ac223 100644
--- a/debian/live-initramfs.init
+++ b/debian/live-initramfs.init
@@ -85,7 +85,8 @@ 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}/device | grep -q usb
+	if readlink /sys/block/${DEVICE} | grep -q usb ||
+	   readlink /sys/block/${DEVICE}/device | grep -q usb # linux < 2.6.29
 	then
 		return 0
 	fi

-- 
Debian Live initramfs hook