@ -211,9 +211,9 @@ 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-active 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
set -- ubuntu ubuntu-dvd kubuntu kubuntu-dvd kubuntu-active edubuntu edubuntu-dvd mythbuntu xubuntu gobuntu base ubuntu-headless
fi
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-active | xubuntu| mythbuntu| gobuntu| ubuntu-mid| ubuntu-netbook| ubuntu-moblin-remix| base| ubuntu-headless| tocd| cloud-live)
; ;
*)
echo bad name >& 2;
@ -278,15 +278,11 @@ Flags: seen
LIST = " $LIST minimal^ standard^ kubuntu-desktop^ "
LIVELIST = " kubuntu-live^ laptop-detect $LIVE_BOOT_SCRIPTS "
; ;
kubuntu-mobil e)
LIST = " $LIST minimal^ standard^ kubuntu- mobil e^"
LIVELIST = " kubuntu- mobil e-live^ laptop-detect $LIVE_BOOT_SCRIPTS "
kubuntu-activ e)
LIST = " $LIST minimal^ standard^ kubuntu- activ e^"
LIVELIST = " kubuntu- activ e-live^ laptop-detect $LIVE_BOOT_SCRIPTS "
COMP = "main restricted universe"
; ;
kubuntu-netbook)
LIST = " $LIST minimal^ standard^ kubuntu-netbook^ "
LIVELIST = " kubuntu-netbook-live^ laptop-detect $LIVE_BOOT_SCRIPTS "
; ;
edubuntu| edubuntu-dvd)
LIST = " $LIST minimal^ standard^ edubuntu-desktop-gnome^ "
LIVELIST = " edubuntu-live^ laptop-detect $LIVE_BOOT_SCRIPTS "
@ -330,6 +326,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/config"
; ;
tocd)
LIST = " $LIST minimal^ standard^ "
tocdtmp = ` mktemp -d` || exit 1
@ -528,6 +530,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.$$
@ -728,8 +735,7 @@ Pin-Priority: 550
# No point keeping Gnome icon cache around for Kubuntu
if [ " $FS " = "kubuntu" ] || \
[ " $FS " = "kubuntu-netbook" ] || \
[ " $FS " = "kubuntu-mobile" ] ; then
[ " $FS " = "kubuntu-active" ] ; then
rm -f ${ ROOT } /usr/share/icons/*/icon-theme.cache
fi