diff options
| author | Daniel Baumann <daniel@debian.org> | 2009-10-26 13:28:56 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:48:06 +0100 |
| commit | b9080e2877ab788d96ff0e16794aa372436fbebf (patch) | |
| tree | bdd98c0a8ee10f18e2bccaf3c90c29564cfc9739 | |
| parent | bd76bd44a773f1495e3d20d5de2a1201ee2fb854 (diff) | |
| download | live-boot-b9080e2877ab788d96ff0e16794aa372436fbebf.tar.gz live-boot-b9080e2877ab788d96ff0e16794aa372436fbebf.zip | |
Merging casper 1.162.
| -rw-r--r-- | docs/ChangeLog.casper | 7 | ||||
| -rwxr-xr-x | scripts/live-bottom/43disable_updateinitramfs | 23 |
2 files changed, 27 insertions, 3 deletions
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index b57c39b..e051d62 100644 --- a/docs/ChangeLog.casper +++ b/docs/ChangeLog.casper @@ -1,3 +1,10 @@ +casper (1.162) jaunty; urgency=low + + * If /cdrom is writable, call the diverted update-initramfs and copy + the resulting kernel and initrd to /cdrom/casper (LP: #292159). + + -- Evan Dandrea <evand@ubuntu.com> Tue, 10 Mar 2009 14:36:30 +0000 + casper (1.161) jaunty; urgency=low [ Juanje Ojeda ] diff --git a/scripts/live-bottom/43disable_updateinitramfs b/scripts/live-bottom/43disable_updateinitramfs index 0a434ed..dab2290 100755 --- a/scripts/live-bottom/43disable_updateinitramfs +++ b/scripts/live-bottom/43disable_updateinitramfs @@ -22,20 +22,37 @@ esac . /scripts/live-functions -log_begin_msg "Disabling update-initramfs" +log_begin_msg "Possibly disabling update-initramfs (useless on a live CD)..." # live-initramfs script chroot /root dpkg-divert --add --rename --quiet \ /usr/sbin/update-initramfs -cat > /root/usr/sbin/update-initramfs <<EOF +# Running off a USB disk or other writable media. +if [ -w /cdrom ] +then + +cat > /root/usr/sbin/update-initramfs << EOF +#!/bin/sh + +update-initramfs.distrib "$@" +cp /initrd.img /cdrom/live/initrd.gz +cp /vmlinuz /cdrom/live/vmlinuz +exit 0 +EOF + +else + +cat > /root/usr/sbin/update-initramfs << EOF #!/bin/sh -echo "update-initramfs is disabled since running on a live CD" +echo "update-initramfs is disabled since running on read-only media" exit 0 EOF +fi + chmod 0755 /root/usr/sbin/update-initramfs log_end_msg |