From e6831e43211a602457c4f7b36a1c1e90665e6890 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Fri, 25 Jun 2010 21:59:16 -0700 Subject: [PATCH] Import patches-unapplied version 1.122 to ubuntu/maverick Imported using git-ubuntu import. Changelog parent: 482984f3d9b9b0263b009eac3b41f1724ed4609d New changelog entries: * livecd.sh don't set a variable to itself, especially when the variable is empty and causes build failures under set -u. --- debian/changelog | 7 +++++++ livecd.sh | 2 -- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e454e938..4e2ddcf5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (1.122) maverick; urgency=low + + * livecd.sh don't set a variable to itself, especially when the variable + is empty and causes build failures under set -u. + + -- Steve Langasek Fri, 25 Jun 2010 21:59:16 -0700 + livecd-rootfs (1.121) maverick; urgency=low [ LaMont Jones ] diff --git a/livecd.sh b/livecd.sh index 4219fdc0..801c6627 100755 --- a/livecd.sh +++ b/livecd.sh @@ -180,8 +180,6 @@ fi if [ "$IMAGEFORMAT" = "ext2" ] || [ "$IMAGEFORMAT" = "ext3" ]; then LIVE_BOOT_SCRIPTS="jasper" -else - LIVE_BOOT_SCRIPTS="$LIVE_BOOT_SCRIPTS" fi for arg in "$@"; do