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.
This commit is contained in:
Steve Langasek 2010-06-25 21:59:16 -07:00 committed by usd-importer
parent 482984f3d9
commit e6831e4321
2 changed files with 7 additions and 2 deletions

7
debian/changelog vendored
View File

@ -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 <steve.langasek@ubuntu.com> Fri, 25 Jun 2010 21:59:16 -0700
livecd-rootfs (1.121) maverick; urgency=low livecd-rootfs (1.121) maverick; urgency=low
[ LaMont Jones ] [ LaMont Jones ]

View File

@ -180,8 +180,6 @@ fi
if [ "$IMAGEFORMAT" = "ext2" ] || [ "$IMAGEFORMAT" = "ext3" ]; then if [ "$IMAGEFORMAT" = "ext2" ] || [ "$IMAGEFORMAT" = "ext3" ]; then
LIVE_BOOT_SCRIPTS="jasper" LIVE_BOOT_SCRIPTS="jasper"
else
LIVE_BOOT_SCRIPTS="$LIVE_BOOT_SCRIPTS"
fi fi
for arg in "$@"; do for arg in "$@"; do