[Merge] ~mwhudson/livecd-rootfs/+git/livecd-rootfs:ubuntu-core-installer into livecd-rootfs:ubuntu/master

[Steve Langasek]

Review: Needs Information



Diff comments:

> diff --git a/live-build/auto/config b/live-build/auto/config
> index ac63994..8e17398 100755
> --- a/live-build/auto/config
> +++ b/live-build/auto/config
> @@ -421,7 +421,7 @@ case $IMAGEFORMAT in
>  		;;
>  	plain)
>  		case $PROJECT:${SUBPROJECT:-} in
> -			ubuntu-server:live)
> +			ubuntu-server:live|ubuntu-core-installer:)
>  	                        touch config/universe-enabled

aaaaaaaaahhhhhh

>  				;;
>  			ubuntu-mini-iso:)
> @@ -1045,6 +1045,20 @@ case $PROJECT in
>  		PREINSTALL_POOL_SEEDS='server-ship'
>  		;;
>  
> +	ubuntu-core-installer)
> +	    OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
> +	    PASSES_TO_LAYERS=true
> +	    add_task base server
> +	    add_package base.live cloud-init

shouldn't this be redundant as cloud-init is already in task server-minimal?

> +
> +	    add_task base.live server-live
> +
> +	    add_package base.live linux-generic

If this is a core installer, why linux-generic instead of linux-image-generic (which would be smaller)?

> +
> +	    /usr/share/livecd-rootfs/checkout-translations-branch \
> +		https://git.launchpad.net/subiquity po config/catalog-translations
> +	    ;;
> +
>  	ubuntu-mini-iso)
>  		OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
>  
> diff --git a/live-build/ubuntu-core-installer/hooks/03-kernel-metapkg.chroot_early b/live-build/ubuntu-core-installer/hooks/03-kernel-metapkg.chroot_early
> new file mode 100755
> index 0000000..f6ad5c7
> --- /dev/null
> +++ b/live-build/ubuntu-core-installer/hooks/03-kernel-metapkg.chroot_early
> @@ -0,0 +1,19 @@
> +#!/bin/bash -ex
> +# vi: ts=4 noexpandtab
> +
> +case $PASS in
> +    base.live)
> +        ;;
> +    *)
> +        exit 0
> +        ;;
> +esac

curious style inconsistency between live-build/ubuntu-core-installer/hooks/02-installer-bits.chroot and the other scripts

> +
> +
> +cat <<EOF > /etc/initramfs-tools/conf.d/casperize.conf
> +export CASPER_GENERATE_UUID=1
> +EOF
> +
> +cat <<EOF > /etc/initramfs-tools/conf.d/default-layer.conf
> +LAYERFS_PATH=${PASS}.squashfs
> +EOF


-- 
https://code.launchpad.net/~mwhudson/livecd-rootfs/+git/livecd-rootfs/+merge/466280
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/master.