From 1091736d0126dfac4520aebfaa3d541cd99db00d Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Tue, 29 Jun 2010 12:54:35 +0200 Subject: [PATCH] Import patches-unapplied version 1.127 to ubuntu/maverick Imported using git-ubuntu import. Changelog parent: 8d03e3cfd5c054561281288ace72e7f27257b839 New changelog entries: * make BuildLiveCD set $SUBARCHARG properly again, else livecd.sh doesnt get the necessary option handed over. --- BuildLiveCD | 4 ++++ debian/changelog | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/BuildLiveCD b/BuildLiveCD index 08ea9b96..426f3c17 100755 --- a/BuildLiveCD +++ b/BuildLiveCD @@ -40,6 +40,10 @@ while getopts :s:d:f:p name; do case $name in esac; done; shift $((OPTIND-1)) +if [ -n "$SUBARCH" ]; then + SUBARCHARG="-s$SUBARCH" +fi + for s in $NEWSUITE; do if [ -d build-${s}-live/chroot-${s} ]; then SUITES="$SUITES $s"; fi done diff --git a/debian/changelog b/debian/changelog index 066d664a..97c3fd92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (1.127) maverick; urgency=low + + * make BuildLiveCD set $SUBARCHARG properly again, else livecd.sh doesnt get + the necessary option handed over. + + -- Oliver Grawert Tue, 29 Jun 2010 12:54:35 +0200 + livecd-rootfs (1.126) maverick; urgency=low * Set LIVE_BOOT_SCRIPTS to "casper lupin-casper" for non-jasper builds,