[SCM] live-boot branch, debian-next, updated. debian/3.0_a12-1-1-g3d328ce

Daniel Baumann daniel at debian.org
Thu Nov 25 13:59:59 UTC 2010


The following commit has been merged in the debian-next branch:
commit 3d328ce5724ef6064df8701b02375947a625b8d9
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Nov 25 14:59:33 2010 +0100

    Removing legacy code for detecting removable usb sticks on kernels prior 2.6.29.

diff --git a/scripts/live b/scripts/live
index 90eca0f..1baf82e 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1635,8 +1635,7 @@ find_livefs ()
 			do
 				if [ "$(cat ${sysblock}/removable)" = "1" ]
 				then
-					if readlink ${sysblock} | grep -q usb ||
-					   readlink ${sysblock}/device | grep -q usb # linux < 2.6.29
+					if readlink ${sysblock} | grep -q usb
 					then
 						for dev in $(subdevices "${sysblock}")
 						do

-- 
live-boot



More information about the debian-live-changes mailing list