From 87d6aa1876af342230db2626f3feeefc29a8da62 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 23 Aug 2011 18:28:44 +0100 Subject: [PATCH] Link binary.iso or binary-hybrid.iso, if found, into the output directory for use by BuildLiveCD. --- debian/changelog | 7 +++++++ live-build/auto/build | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/debian/changelog b/debian/changelog index e1ca053e..59741d22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.31) UNRELEASED; urgency=low + + * Link binary.iso or binary-hybrid.iso, if found, into the output + directory for use by BuildLiveCD. + + -- Colin Watson Tue, 23 Aug 2011 18:28:02 +0100 + livecd-rootfs (2.30) oneiric; urgency=low * provide .bootimg as a link to .bootimg-$FLAVOUR similar to the diff --git a/live-build/auto/build b/live-build/auto/build index 0417c677..216493bc 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -116,6 +116,13 @@ for OUTPUT in ext2 ext3 ext4 manifest manifest-remove size squashfs; do chmod 644 "$PREFIX.$OUTPUT" done +for ISO in binary.iso binary-hybrid.iso; do + [ -e "$ISO" ] || continue + ln "$ISO" "$PREFIX.iso" + chmod 644 "$PREFIX.iso" + break +done + if [ -e "binary/$INITFS/filesystem.dir" ]; then (cd "binary/$INITFS/filesystem.dir/" && tar -c *) | \ gzip -9 --rsyncable > "$PREFIX.rootfs.tar.gz"