From 6d079349706c802f30409813a808de230709d03d Mon Sep 17 00:00:00 2001 From: Ante Karamatic Date: Fri, 17 Feb 2012 10:52:37 +0100 Subject: [PATCH 1/3] Add cloud-live project to livecd.sh --- livecd.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/livecd.sh b/livecd.sh index 711bf28f..30e42c7d 100755 --- a/livecd.sh +++ b/livecd.sh @@ -211,7 +211,7 @@ esac; done; shift $((OPTIND-1)) if (( $# == 0 )) || [ "X$1" = "Xall" ]; then - set -- ubuntu kubuntu kubuntu-mobile kubuntu-netbook edubuntu xubuntu mythbuntu gobuntu base ubuntu-headless + set -- ubuntu kubuntu kubuntu-mobile kubuntu-netbook edubuntu xubuntu mythbuntu gobuntu base ubuntu-headless cloud-live if [ "$ARCH" = "i386" ]; then set -- ubuntu ubuntu-dvd kubuntu kubuntu-dvd kubuntu-mobile kubuntu-netbook edubuntu edubuntu-dvd mythbuntu xubuntu gobuntu base ubuntu-headless fi @@ -225,7 +225,7 @@ fi for arg in "$@"; do case "$arg" in - ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-mobile|kubuntu-netbook|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-netbook|ubuntu-moblin-remix|base|ubuntu-headless|tocd) + ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-mobile|kubuntu-netbook|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-netbook|ubuntu-moblin-remix|base|ubuntu-headless|tocd|cloud-live) ;; *) echo bad name >&2; @@ -330,6 +330,12 @@ Flags: seen LIST="$LIST minimal^ standard^" LIVELIST="$LIVE_BOOT_SCRIPTS" ;; + cloud-live) + LIST="$LIST minimal^ standard^" + LIVELIST="minimal^ standard^ cloud-live-config $LIVE_BOOT_SCRIPTS" + COMP="main restricted universe" + PPA="cloud-live/ppa" + ;; tocd) LIST="$LIST minimal^ standard^" tocdtmp=`mktemp -d` || exit 1 @@ -528,6 +534,11 @@ Pin-Priority: 900 rm -f ${ROOT}var/cache/apt/{,src}pkgcache.bin fi + if [ "$FS" = "cloud-live" ]; then + chroot $ROOT apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F3531FCE + chroot $ROOT apt-get update + fi + # In addition to the ones we got from apt, trust whatever the local system # believes in, but put things back afterwards. cp ${ROOT}etc/apt/trusted.gpg ${ROOT}etc/apt/trusted.gpg.$$ From 0e38e251b6891c92248142f23c52cb4a1228c10e Mon Sep 17 00:00:00 2001 From: Ante Karamatic Date: Fri, 17 Feb 2012 10:56:21 +0100 Subject: [PATCH 2/3] Add cloud-live to BuildLiveCD --- BuildLiveCD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BuildLiveCD b/BuildLiveCD index de64be46..05675ed6 100755 --- a/BuildLiveCD +++ b/BuildLiveCD @@ -89,7 +89,7 @@ esac for arg in "$@"; do case "$arg" in - *ubuntu|*ubuntu-dvd|kubuntu-mobile|kubuntu-netbook|ubuntu-lpia|ubuntu-mid|ubuntu-umpc|ubuntu-mobile|ubuntu-netbook|ubuntu-moblin-remix|mythbuntu|ubuntustudio-dvd|base|tocd|ubuntu-headless|ubuntu-server|ubuntu-core) ;; + *ubuntu|*ubuntu-dvd|kubuntu-mobile|kubuntu-netbook|ubuntu-lpia|ubuntu-mid|ubuntu-umpc|ubuntu-mobile|ubuntu-netbook|ubuntu-moblin-remix|mythbuntu|ubuntustudio-dvd|base|tocd|ubuntu-headless|ubuntu-server|ubuntu-core|cloud-live) ;; *) echo "bad project: $arg" >&2 exit 2 From 21871c2cf610d059ae1ea3928850e92fd37a1041 Mon Sep 17 00:00:00 2001 From: Ante Karamatic Date: Fri, 17 Feb 2012 11:24:07 +0100 Subject: [PATCH 3/3] Fix cloud-live PPA --- livecd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livecd.sh b/livecd.sh index 30e42c7d..2e7c15d6 100755 --- a/livecd.sh +++ b/livecd.sh @@ -334,7 +334,7 @@ Flags: seen LIST="$LIST minimal^ standard^" LIVELIST="minimal^ standard^ cloud-live-config $LIVE_BOOT_SCRIPTS" COMP="main restricted universe" - PPA="cloud-live/ppa" + PPA="cloud-live/config" ;; tocd) LIST="$LIST minimal^ standard^"