|
|
|
@ -148,6 +148,9 @@ case $IMAGEFORMAT in
|
|
|
|
|
OPTS="${OPTS:+$OPTS }--initramfs $INITRAMFS_TYPE --chroot-filesystem $IMAGEFORMAT"
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
none)
|
|
|
|
|
OPTS="${OPTS:+$OPTS }--chroot-filesystem $IMAGEFORMAT"
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
case $PROJECT in
|
|
|
|
|
ubuntu-server|ubuntu-touch|ubuntu-touch-custom)
|
|
|
|
@ -773,6 +776,9 @@ EOF
|
|
|
|
|
ubuntu-touch:*|ubuntu-touch-custom:*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*|ubuntu-server:live)
|
|
|
|
|
cp -af /usr/share/livecd-rootfs/live-build/${PROJECT}/* \
|
|
|
|
|
config/
|
|
|
|
|
if [ "$IMAGEFORMAT" = none ]; then
|
|
|
|
|
rm -f config/hooks/*.binary*
|
|
|
|
|
fi
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|