[SCM] live-initramfs branch, debian-next, updated. debian/1.199.1-1-24-ge39fdbd

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit e39fdbdcfd87aff08cb4b1dc597f75c93cf38dda
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat May 1 13:53:29 2010 +0200

    Merging casper 1.223.

diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
index bc8bbb0..5552264 100644
--- a/docs/ChangeLog.casper
+++ b/docs/ChangeLog.casper
@@ -1,3 +1,13 @@
+casper (1.223) lucid; urgency=low
+
+  * Bind-mount /dev, /proc, and /sys into /root while running apt-cdrom.
+  * Copy /lib/udev/rules.d/60-cdrom_id.rules into the initramfs to go with
+    /lib/udev/cdrom_id, so that apt-cdrom will be able to find ID_CDROM=1
+    entries when we run it.  This should stop update-notifier from
+    repeatedly popping up during the live session.
+
+ -- Colin Watson <cjwatson at ubuntu.com>  Tue, 23 Feb 2010 01:35:30 +0000
+
 casper (1.222) lucid; urgency=low
 
   * scripts/casper-bottom/47une_ubiquity:
diff --git a/hooks/live b/hooks/live
index a018d95..e76f3b0 100755
--- a/hooks/live
+++ b/hooks/live
@@ -60,14 +60,20 @@ do
 done
 
 # udev dependencies (squeeze and newer)
-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 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
+
+	mkdir -p ${DESTDIR}/lib/udev/rules.d
+	cp -p /lib/udev/rules.d/60-cdrom_id.rules ${DESTDIR}/lib/udev/rules.d
+fi
 
 # Handling other stuff
 
diff --git a/scripts/live-bottom/41apt_cdrom b/scripts/live-bottom/41apt_cdrom
index 00606d5..0b3f79b 100755
--- a/scripts/live-bottom/41apt_cdrom
+++ b/scripts/live-bottom/41apt_cdrom
@@ -33,7 +33,15 @@ log_begin_msg "Adding APT-CDROM source"
 
 if [ -d /root/cdrom ]
 then
+	mount -n -o bind /sys /root/sys
+	mount -n -o bind /proc /root/proc
+	mount -n -o bind /dev /root/dev
+
 	chroot /root apt-cdrom -m add
+
+	umount /root/dev
+	umount /root/proc
+	umount /root/sys
 fi
 
 log_end_msg

-- 
live-initramfs