[Merge] ~mwhudson/livecd-rootfs/+git/livecd-rootfs:minimal-server-layer-3 into livecd-rootfs:ubuntu/master

[Didier Roche]

Review: Needs Information

> Did you forget to save some diff comments, I don't see anything?

Noooooooooooo. I'm too use to GitHub now when both are saved at the same time, and I didn't save them. It doesn't seem they are stored in a cache, let me redo them...

Diff comments:

> diff --git a/live-build/auto/config b/live-build/auto/config
> index 6d5fce1..d6d9d40 100755
> --- a/live-build/auto/config
> +++ b/live-build/auto/config
> @@ -773,15 +773,17 @@ case $PROJECT in
>  		case ${SUBPROJECT:-} in
>  			live)
>  				PASSES_TO_LAYERS=true
> -				add_task ubuntu-server minimal standard server
> +				add_task ubuntu-server-minimal server-minimal
> +				add_package ubuntu-server-minimal lxd-installer

is lxd-installer minimal enough to be in the ubuntu-server-minimal layer?

> +				add_task ubuntu-server-minimal.ubuntu-server minimal standard server

The question here is: is minimal task not minimal enough so that you don't add it to the ubuntu-server-minimal layer?

Should we fix the minimal task to be really minimal for all ubuntu flavors?

>  				# add_task really should do this itself but for now...
> -				snap_from_seed server config/package-lists/livecd-rootfs.snaplist.chroot_ubuntu-server.full
> -				add_package ubuntu-server cloud-init
> +				snap_from_seed server config/package-lists/livecd-rootfs.snaplist.chroot_ubuntu-server-minimal.ubuntu-server.full
> +				add_package ubuntu-server-minimal.ubuntu-server cloud-init
>  
> -				add_package ubuntu-server.installer linux-firmware lupin-casper openssh-server
> -				add_snap ubuntu-server.installer subiquity/classic
> +				add_package ubuntu-server-minimal.ubuntu-server.installer linux-firmware lupin-casper openssh-server
> +				add_snap ubuntu-server-minimal.ubuntu-server.installer subiquity/classic
>  				if [ $ARCH = s390x ]; then
> -					add_package ubuntu-server.installer s390-tools-zkey
> +					add_package ubuntu-server-minimal.ubuntu-server.installer s390-tools-zkey
>  				fi
>  
>  				# Live server ISOs for LTS point releases past .2 offer both
> @@ -804,8 +806,8 @@ case $PROJECT in
>  						exit 1
>  					fi
>  
> -					add_package ubuntu-server.installer.$flavor $kernel_metapkg
> -					LIVE_PASSES="${LIVE_PASSES:+$LIVE_PASSES }ubuntu-server.installer.$flavor"
> +					add_package ubuntu-server-minimal.ubuntu-server.installer.$flavor $kernel_metapkg
> +					LIVE_PASSES="${LIVE_PASSES:+$LIVE_PASSES }ubuntu-server-minimal.ubuntu-server.installer.$flavor"

should ubuntu-server-minimal.ubuntu-server.installer be a LIVE_PASSES as well? (like with no specific kernel), as it won't be installed. I say this because... (see next comment)

>  				done
>  				;;
>  			*)
> diff --git a/live-build/ubuntu-server/hooks/02-installer-bits.chroot b/live-build/ubuntu-server/hooks/02-installer-bits.chroot
> index d71157c..49a6c27 100755
> --- a/live-build/ubuntu-server/hooks/02-installer-bits.chroot
> +++ b/live-build/ubuntu-server/hooks/02-installer-bits.chroot
> @@ -1,7 +1,7 @@
>  #!/bin/bash -ex
>  # vi: ts=4 noexpandtab
>  
> -if [ "${PASS}" != "ubuntu-server.installer" ]; then
> +if [ "${PASS}" != "ubuntu-server-minimal.ubuntu-server.installer" ]; then

That way, we don't hardcode the PASS here and use the is_live_pass helper...

>      exit 0
>  fi
>  
> diff --git a/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early b/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early
> index 7e99c6b..864d4c4 100755
> --- a/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early
> +++ b/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early
> @@ -2,7 +2,7 @@
>  # vi: ts=4 noexpandtab
>  
>  case $PASS in
> -    ubuntu-server.installer.*)
> +    ubuntu-server-minimal.ubuntu-server.installer.*)

Same here, we can use is_live_pass helper.

>          flavor=${PASS##*.}
>          if [ "$flavor" = "generic" ]; then
>              kernel_metapkg=linux-generic
> diff --git a/live-build/ubuntu-server/hooks/04-kernel-bits.binary b/live-build/ubuntu-server/hooks/04-kernel-bits.binary
> index 3b5f086..c0b2e3d 100755
> --- a/live-build/ubuntu-server/hooks/04-kernel-bits.binary
> +++ b/live-build/ubuntu-server/hooks/04-kernel-bits.binary
> @@ -2,7 +2,7 @@
>  # vi: ts=4 noexpandtab
>  
>  case $PASS in
> -    ubuntu-server.installer.*)
> +    ubuntu-server-minimal.ubuntu-server.installer.*)

ditto

>          flavor=${PASS##*.}
>          ;;
>      *)


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