@ -135,7 +135,7 @@ case $IMAGEFORMAT in
*)
*)
case $PROJECT in
case $PROJECT in
ubuntu-server|ubuntu-touch|ubuntu-pd )
ubuntu-server|ubuntu-touch|ubuntu-touch-custom )
;;
;;
*)
*)
add_package live lupin-casper
add_package live lupin-casper
@ -168,7 +168,7 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then
ubuntu-server)
ubuntu-server)
add_package live oem-config-debconf ubiquity-frontend-debconf
add_package live oem-config-debconf ubiquity-frontend-debconf
;;
;;
ubuntu-core|ubuntu-base|base|ubuntu-touch|ubuntu-pd |ubuntu-cpc|ubuntu-desktop-next)
ubuntu-core|ubuntu-base|base|ubuntu-touch|ubuntu-touch-custom |ubuntu-cpc|ubuntu-desktop-next)
;;
;;
*)
*)
add_package live oem-config-gtk ubiquity-frontend-gtk
add_package live oem-config-gtk ubiquity-frontend-gtk
@ -419,13 +419,8 @@ case $PROJECT in
OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
;;
;;
ubuntu-touch|ubuntu-pd)
ubuntu-touch|ubuntu-touch-custom)
if [ "$PROJECT" = "ubuntu-touch" ]; then
add_package install ubuntu-minimal ubuntu-touch systemd-sysv- packagekit ubuntu-system-settings-online-accounts
meta_package=ubuntu-touch
else
meta_package=ubuntu-pocket-desktop
fi
add_package install ubuntu-minimal $meta_package systemd-sysv- packagekit ubuntu-system-settings-online-accounts
COMPONENTS='main restricted universe'
COMPONENTS='main restricted universe'
BOOTAPPEND_LIVE='hostname=ubuntu-phablet username=ubuntu'
BOOTAPPEND_LIVE='hostname=ubuntu-phablet username=ubuntu'
@ -563,7 +558,7 @@ case $ARCH in
esac
esac
case $PROJECT in
case $PROJECT in
ubuntu-server|ubuntu-core|ubuntu-base|ubuntu-touch|ubuntu-pd )
ubuntu-server|ubuntu-core|ubuntu-base|ubuntu-touch|ubuntu-touch-custom )
case $SUBPROJECT in
case $SUBPROJECT in
system-image)
system-image)
# keep the kernel for the system-image build
# keep the kernel for the system-image build
@ -749,7 +744,7 @@ EOF
fi
fi
;;
;;
ubuntu-touch:*|ubuntu-pd :*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*)
ubuntu-touch:*|ubuntu-touch-custom :*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*)
cp -af /usr/share/livecd-rootfs/live-build/${PROJECT}/* \
cp -af /usr/share/livecd-rootfs/live-build/${PROJECT}/* \
config/
config/
;;
;;