diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 15:11:47 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:31:05 +0100 |
| commit | ba92d70df7c43aad50119ee457e4f0a8a48523b6 (patch) | |
| tree | 4b579c6ed818d2df2e5fd1970799c1299996f366 | |
| parent | 910796f91a3ce3211677659bf7c0d0bf214a1d05 (diff) | |
| download | live-boot-ba92d70df7c43aad50119ee457e4f0a8a48523b6.tar.gz live-boot-ba92d70df7c43aad50119ee457e4f0a8a48523b6.zip | |
Merging casper 1.100.
| -rw-r--r-- | docs/ChangeLog.casper | 8 | ||||
| -rwxr-xr-x | 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 <cjwatson@ubuntu.com> 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 |