Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-16 13:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge lp:~ivoks/livecd-rootfs/cloud-live

Browse Source
This commit is contained in:
Colin Watson 2012-02-17 15:37:26 +00:00
commit 3fbfad3c54
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BuildLiveCD
View File

@ -89,7 +89,7 @@ esac
for arg in "$@"; do for arg in "$@"; do
case "$arg" in 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 echo "bad project: $arg" >&2
exit 2 exit 2

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.56) UNRELEASED; urgency=low
[ Ante Karamatić ]
* Add cloud-live project to livecd.sh and BuildLiveCD.
-- Colin Watson <cjwatson@ubuntu.com> Fri, 17 Feb 2012 15:36:14 +0000
livecd-rootfs (2.55) precise; urgency=low livecd-rootfs (2.55) precise; urgency=low
* Build Lubuntu with --no-install-recommends, to match its seed structure * Build Lubuntu with --no-install-recommends, to match its seed structure

15
livecd.sh
View File

@ -211,7 +211,7 @@ esac; done;
shift $((OPTIND-1)) shift $((OPTIND-1))
if (( $# == 0 )) || [ "X$1" = "Xall" ]; then 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 if [ "$ARCH" = "i386" ]; then
set -- ubuntu ubuntu-dvd kubuntu kubuntu-dvd kubuntu-mobile kubuntu-netbook edubuntu edubuntu-dvd mythbuntu xubuntu gobuntu base ubuntu-headless set -- ubuntu ubuntu-dvd kubuntu kubuntu-dvd kubuntu-mobile kubuntu-netbook edubuntu edubuntu-dvd mythbuntu xubuntu gobuntu base ubuntu-headless
fi fi
@ -225,7 +225,7 @@ 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-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; echo bad name >&2;
@ -330,6 +330,12 @@ Flags: seen
LIST="$LIST minimal^ standard^" LIST="$LIST minimal^ standard^"
LIVELIST="$LIVE_BOOT_SCRIPTS" 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/config"
;;
tocd) tocd)
LIST="$LIST minimal^ standard^" LIST="$LIST minimal^ standard^"
tocdtmp=`mktemp -d` || exit 1 tocdtmp=`mktemp -d` || exit 1
@ -528,6 +534,11 @@ Pin-Priority: 900
rm -f ${ROOT}var/cache/apt/{,src}pkgcache.bin rm -f ${ROOT}var/cache/apt/{,src}pkgcache.bin
fi 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 # In addition to the ones we got from apt, trust whatever the local system
# believes in, but put things back afterwards. # believes in, but put things back afterwards.
cp ${ROOT}etc/apt/trusted.gpg ${ROOT}etc/apt/trusted.gpg.$$ cp ${ROOT}etc/apt/trusted.gpg ${ROOT}etc/apt/trusted.gpg.$$