Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-15 04:41:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

instead of special casing for only one arch, base jasper vs casper inclusion on the IMAGETYPE variable

Browse Source
This commit is contained in:
Oliver Grawert 2010-06-25 17:14:39 +02:00
parent 943022fd17
commit 8cea9b682d
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,9 +1,14 @@
livecd-rootfs (1.121) UNRELEASED; urgency=low livecd-rootfs (1.121) UNRELEASED; urgency=low
[ LaMont Jones ]
* BuildLiveCD: only pass -f if we were told it, since older chroots don't * BuildLiveCD: only pass -f if we were told it, since older chroots don't
support it. support it.
-- LaMont Jones <lamont@ubuntu.com> Wed, 16 Jun 2010 16:44:24 -0600 [ Oliver Grawert ]
* instead of special casing for only one arch, base jasper vs casper
inclusion on the IMAGETYPE variable
-- Oliver Grawert <ogra@ubuntu.com> Fri, 25 Jun 2010 17:13:52 +0200
livecd-rootfs (1.120) maverick; urgency=low livecd-rootfs (1.120) maverick; urgency=low

29
livecd.sh
View File

@ -178,6 +178,12 @@ if (( $# == 0 )) || [ "X$1" = "Xall" ]; then
fi fi
fi fi
if [ "$IMAGEFORMAT" = "ext2" ] || [ "$IMAGEFORMAT" = "ext3" ]; then
LIVE_BOOT_SCRIPTS="jasper"
else
LIVE_BOOT_SCRIPTS="$LIVE_BOOT_SCRIPTS"
fi
for arg in "$@"; do for arg in "$@"; do
case "$arg" in case "$arg" in
ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-netbook|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-netbook|ubuntu-moblin-remix|base|tocd) ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-netbook|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-netbook|ubuntu-moblin-remix|base|tocd)
@ -222,29 +228,29 @@ Flags: seen
case "$FS" in case "$FS" in
ubuntu|ubuntu-lpia|ubuntu-dvd) ubuntu|ubuntu-lpia|ubuntu-dvd)
LIST="$LIST minimal^ standard^ ubuntu-desktop^" LIST="$LIST minimal^ standard^ ubuntu-desktop^"
LIVELIST="ubuntu-live^ laptop-detect casper lupin-casper" LIVELIST="ubuntu-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
;; ;;
kubuntu|kubuntu-dvd) kubuntu|kubuntu-dvd)
LIST="$LIST minimal^ standard^ kubuntu-desktop^" LIST="$LIST minimal^ standard^ kubuntu-desktop^"
LIVELIST="kubuntu-live^ laptop-detect casper lupin-casper" LIVELIST="kubuntu-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
;; ;;
kubuntu-netbook) kubuntu-netbook)
LIST="$LIST minimal^ standard^ kubuntu-netbook^" LIST="$LIST minimal^ standard^ kubuntu-netbook^"
LIVELIST="language-support-en kubuntu-netbook-live^ laptop-detect casper lupin-casper" LIVELIST="language-support-en kubuntu-netbook-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
;; ;;
edubuntu|edubuntu-dvd) edubuntu|edubuntu-dvd)
LIST="$LIST minimal^ standard^ edubuntu-desktop-gnome^" LIST="$LIST minimal^ standard^ edubuntu-desktop-gnome^"
LIVELIST="edubuntu-live^ laptop-detect casper lupin-casper" LIVELIST="edubuntu-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
COMP="main restricted universe" COMP="main restricted universe"
;; ;;
xubuntu) xubuntu)
LIST="$LIST minimal^ standard^ xterm xubuntu-desktop^" LIST="$LIST minimal^ standard^ xterm xubuntu-desktop^"
LIVELIST="xubuntu-live^ laptop-detect casper lupin-casper" LIVELIST="xubuntu-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
COMP="main restricted universe multiverse" COMP="main restricted universe multiverse"
;; ;;
gobuntu) gobuntu)
LIST="$LIST minimal^ standard^ gobuntu-desktop^" LIST="$LIST minimal^ standard^ gobuntu-desktop^"
LIVELIST="gobuntu-live^ laptop-detect casper lupin-casper" LIVELIST="gobuntu-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
COMP="main" COMP="main"
;; ;;
ubuntu-mid) ubuntu-mid)
@ -254,16 +260,11 @@ Flags: seen
;; ;;
ubuntu-netbook) ubuntu-netbook)
LIST="$LIST minimal^ standard^ ubuntu-netbook^" LIST="$LIST minimal^ standard^ ubuntu-netbook^"
LIVELIST="netbook-live^ laptop-detect casper lupin-casper" LIVELIST="netbook-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
case $TARGETARCH+$SUBARCH in
armel+omap*)
LIVELIST="netbook-live^ laptop-detect jasper"
;;
esac
;; ;;
mythbuntu) mythbuntu)
LIST="$LIST minimal^ standard^ mythbuntu-desktop^" LIST="$LIST minimal^ standard^ mythbuntu-desktop^"
LIVELIST="mythbuntu-live^ laptop-detect casper lupin-casper" LIVELIST="mythbuntu-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
COMP="main restricted universe multiverse" COMP="main restricted universe multiverse"
;; ;;
ubuntu-moblin-remix) ubuntu-moblin-remix)
@ -274,7 +275,7 @@ Flags: seen
;; ;;
base) base)
LIST="$LIST minimal^ standard^" LIST="$LIST minimal^ standard^"
LIVELIST="casper lupin-casper" LIVELIST="$LIVE_BOOT_SCRIPTS"
;; ;;
tocd) tocd)
LIST="$LIST minimal^ standard^" LIST="$LIST minimal^ standard^"