From ba92d70df7c43aad50119ee457e4f0a8a48523b6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 23 Sep 2007 15:11:47 +0200 Subject: Merging casper 1.100. --- docs/ChangeLog.casper | 8 ++++++++ scripts/live-bottom/41apt_cdrom | 3 --- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index 5d0d286..159e31a 100644 --- a/docs/ChangeLog.casper +++ b/docs/ChangeLog.casper @@ -1,3 +1,11 @@ +casper (1.100) gutsy; urgency=low + + * scripts/casper-bottom/41apt_cdrom: Remove unnecessary /root/cdrom + mounting/unmounting code, which only serves to generate error messages + (scripts/casper-bottom/05mountpoints handles this already). + + -- Colin Watson Tue, 11 Sep 2007 19:47:58 +0100 + casper (1.99) gutsy; urgency=low [ Luke Yelavich ] diff --git a/scripts/live-bottom/41apt_cdrom b/scripts/live-bottom/41apt_cdrom index fdde34d..63da284 100755 --- a/scripts/live-bottom/41apt_cdrom +++ b/scripts/live-bottom/41apt_cdrom @@ -31,9 +31,6 @@ log_begin_msg "Adding APT-CDROM source..." # live-initramfs script -mkdir -p /root/cdrom -mount -n -o bind /cdrom /root/cdrom chroot /root apt-cdrom -m add -umount /root/cdrom log_end_msg -- cgit v1.2.3