From dc1eff00fc8383a4808c13e4eb0425d65164ba70 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Tue, 15 Jun 2010 16:34:25 +0200 Subject: [PATCH] Import patches-unapplied version 1.120 to ubuntu/maverick Imported using git-ubuntu import. Changelog parent: 1e0c61bcc3b7168bb87a6dce534e813060109d74 New changelog entries: * add special case to ubuntu-netbook on omap3 and 4, we want jasper instead of casper in the initramfs --- debian/changelog | 7 +++++++ livecd.sh | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0d59c195..bbc76f3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (1.120) maverick; urgency=low + + * add special case to ubuntu-netbook on omap3 and 4, we want jasper instead of + casper in the initramfs + + -- Oliver Grawert Tue, 15 Jun 2010 16:34:25 +0200 + livecd-rootfs (1.119) maverick; urgency=low * Depends: lzma diff --git a/livecd.sh b/livecd.sh index 532d2a96..48228049 100755 --- a/livecd.sh +++ b/livecd.sh @@ -255,6 +255,11 @@ Flags: seen ubuntu-netbook) LIST="$LIST minimal^ standard^ ubuntu-netbook^" LIVELIST="netbook-live^ laptop-detect casper lupin-casper" + case $TARGETARCH+$SUBARCH in + armel+omap*) + LIVELIST="netbook-live^ laptop-detect jasper" + ;; + esac ;; mythbuntu) LIST="$LIST minimal^ standard^ mythbuntu-desktop^"