From d98f901b93cc033ba650f97369a74d94b2a0bfb5 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Tue, 29 Jun 2010 23:03:44 +0200 Subject: [PATCH] do not mangle the project name by attaching the subarch to it on armel --- debian/changelog | 7 +++++++ livecd.sh | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/debian/changelog b/debian/changelog index 97c3fd92..582eef64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (1.128) UNRELEASED; urgency=low + + * do not mangle the project name by attaching the subarch to it on armel, + this results in livefs names that confuse find-live_filesystem + + -- Oliver Grawert Tue, 29 Jun 2010 23:01:16 +0200 + livecd-rootfs (1.127) maverick; urgency=low * make BuildLiveCD set $SUBARCHARG properly again, else livecd.sh doesnt get diff --git a/livecd.sh b/livecd.sh index 9e8030e0..7916077b 100755 --- a/livecd.sh +++ b/livecd.sh @@ -202,6 +202,15 @@ for FS in "$@"; do DEV="" COMP="main restricted" + # we dont want to mangle the project name on armel + # but keep it to not confuse debian-cd/cdimage + case $TARGETARCH in + armel) + FSS=$FS + ;; + esac + ;; + select_mirror # Just in case there's some leftover junk here: