From 8d03e3cfd5c054561281288ace72e7f27257b839 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 28 Jun 2010 16:50:23 +0100 Subject: [PATCH] Import patches-unapplied version 1.126 to ubuntu/maverick Imported using git-ubuntu import. Changelog parent: a6f4c89843e6b1bffa0e765bdc8894c3e24afbf6 New changelog entries: * Set LIVE_BOOT_SCRIPTS to "casper lupin-casper" for non-jasper builds, rather than leaving it empty. --- debian/changelog | 7 +++++++ livecd.sh | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 37055746..066d664a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (1.126) maverick; urgency=low + + * Set LIVE_BOOT_SCRIPTS to "casper lupin-casper" for non-jasper builds, + rather than leaving it empty. + + -- Colin Watson Mon, 28 Jun 2010 16:50:23 +0100 + livecd-rootfs (1.125) maverick; urgency=low * make livecd.sh not fail if e2fsck returns non-zero (which is always the diff --git a/livecd.sh b/livecd.sh index 5903a482..9e8030e0 100755 --- a/livecd.sh +++ b/livecd.sh @@ -181,7 +181,7 @@ fi if [ "$IMAGEFORMAT" = "ext2" ] || [ "$IMAGEFORMAT" = "ext3" ]; then LIVE_BOOT_SCRIPTS="jasper" else - LIVE_BOOT_SCRIPTS= + LIVE_BOOT_SCRIPTS="casper lupin-casper" fi for arg in "$@"; do