[SCM] live-initramfs branch, debian-next, updated. debian/1.199.1-1-38-g3eb0487

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 3eb048781be76491c26f43d9d0ebf0ee1be06b4e
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat May 1 15:40:28 2010 +0200

    Correcting hook to not fail on cdrom_id rules.

diff --git a/hooks/live b/hooks/live
index e76f3b0..afa198d 100755
--- a/hooks/live
+++ b/hooks/live
@@ -60,17 +60,17 @@ do
 done
 
 # udev dependencies (squeeze and newer)
-if ls /lib/udev/*_id > /dev/null 2>&1
-then
-	for FILE in /lib/udev/*_id
-	do
-		if [ ! -e "${DESTDIR}/${FILE}" ]
-		then
-			mkdir -p "${DESTDIR}/lib/udev"
-			copy_exec "${FILE}" /lib/udev
-		fi
-	done
+for FILE in /lib/udev/*_id
+do
+	if [ ! -e "${DESTDIR}/${FILE}" ]
+	then
+		mkdir -p "${DESTDIR}/lib/udev"
+		copy_exec "${FILE}" /lib/udev
+	fi
+done
 
+if [ -e /lib/udev/rules.d/60-cdrom_id.rules ]
+then
 	mkdir -p ${DESTDIR}/lib/udev/rules.d
 	cp -p /lib/udev/rules.d/60-cdrom_id.rules ${DESTDIR}/lib/udev/rules.d
 fi

-- 
live-initramfs