From: Daniel Baumann <daniel@debian.org>
Date: Sat, 1 May 2010 11:53:29 +0000 (+0200)
Subject: Merging casper 1.223.
X-Git-Tag: debian/1.236.1-1~14
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=484c21b329742036eccbe4284df6df9df84138e5;p=live-boot-grml.git

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@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..afa198d 100755
--- a/hooks/live
+++ b/hooks/live
@@ -69,6 +69,12 @@ do
 	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
+
 # Handling other stuff
 
 # Configuration: keymap (usefull when using encryption)
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