[SCM] live-boot branch, debian-next, updated. debian/2.0.0-1-4-gf5c7a3a

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 5b13b8e938c909643dc2a839af40407bbc05019a
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Aug 10 02:01:00 2010 +0200

    Removing lenny support.

diff --git a/hooks/live b/hooks/live
index 34d6eab..c2292d5 100755
--- a/hooks/live
+++ b/hooks/live
@@ -190,12 +190,7 @@ copy_exec /bin/cpio /bin
 # Program: udev
 if [ -x /sbin/udevadm ]
 then
-	# lenny
 	copy_exec /sbin/udevadm /sbin
-else
-	# etch
-	copy_exec /sbin/udevtrigger /sbin
-	copy_exec /sbin/udevsettle /sbin
 fi
 if [ -x /usr/bin/udevinfo ]
 then
diff --git a/scripts/live-bottom/12fstab b/scripts/live-bottom/12fstab
index 31e1e72..ba4a7a3 100755
--- a/scripts/live-bottom/12fstab
+++ b/scripts/live-bottom/12fstab
@@ -66,15 +66,7 @@ then
 			continue
 		fi
 
-		# udev (>= 146) no longer provides vol_id
-		if [ -x /lib/udev/vol_id ]
-		then
-			# lenny
-			/lib/udev/vol_id ${device%%[0-9]*} 2>/dev/null | grep -q "^ID_FS_USAGE=raid" && continue
-		else
-			# squeeze
-			/sbin/blkid -o udev -p ${device%%[0-9]*} | grep -q "^ID_FS_USAGE=raid" && continue
-		fi
+		/sbin/blkid -o udev -p ${device%%[0-9]*} | grep -q "^ID_FS_USAGE=raid" && continue
 
 		magic=$(/bin/dd if="${device}" bs=4086 skip=1 count=1 2>/dev/null | /bin/dd bs=10 count=1 2>/dev/null) || continue
 
diff --git a/scripts/live-helpers b/scripts/live-helpers
index 314c33f..2719eea 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -76,15 +76,7 @@ is_supported_fs ()
 
 get_fstype ()
 {
-	# udev (>= 146) no longer provides vol_id
-	if [ -x /lib/udev/vol_id ]
-	then
-		# lenny
-		/lib/udev/vol_id -t ${1} 2>/dev/null
-	else
-		# squeeze
-		/sbin/blkid -s TYPE -o value $1 2>/dev/null
-	fi
+	/sbin/blkid -s TYPE -o value $1 2>/dev/null
 }
 
 where_is_mounted ()
@@ -345,22 +337,10 @@ find_cow_device ()
 				done
 			fi
 
-			# udev (>= 146) no longer provides vol_id
-			if [ -x /lib/udev/vol_id ]
+			if [ "$(/sbin/blkid -s LABEL -o value $devname 2>/dev/null)" = "${pers_label}" ]
 			then
-				# lenny
-				if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${pers_label}" ]
-				then
-					echo "${devname}"
-					return 0
-				fi
-			else
-				# squeeze
-				if [ "$(/sbin/blkid -s LABEL -o value $devname 2>/dev/null)" = "${pers_label}" ]
-				then
-					echo "${devname}"
-					return 0
-				fi
+				echo "${devname}"
+				return 0
 			fi
 
 			if [ "${PERSISTENT}" = "nofiles" ]

-- 
live-boot