[Merge] ~utkarsh/livecd-rootfs/+git/livecd-rootfs:add-buildinfo-file into livecd-rootfs:ubuntu/master

[Philip Roche]

Review: Needs Fixing



Diff comments:

> diff --git a/live-build/auto/build b/live-build/auto/build
> index 9911708..5818a6c 100755
> --- a/live-build/auto/build
> +++ b/live-build/auto/build
> @@ -430,9 +430,16 @@ serial: $BUILDSTAMP
>  EOF
>  		fi
>  
> -		if [ "$PROJECT" = "ubuntu-oci" ]; then
> +		if [ "${PROJECT}:${SUBPROJECT:-}" = ubuntu-base:minimized ] || [ "${PROJECT}" = "ubuntu-oci" ]; then
>  			if [ -n "$BUILDSTAMP" ]; then
> -				configure_oci chroot "$BUILDSTAMP"
> +				mkdir -p chroot/etc/cloud
> +				cat > chroot/etc/cloud/build.info << EOF
> +build_name: $PROJECT:${SUBPROJECT:}
> +serial: $BUILDSTAMP
> +EOF
> +				if [ "${PROJECT}" = "ubuntu-oci" ]; then
> +					configure_oci chroot "$BUILDSTAMP"

configure_oci can be updated now to not need a second argument as it is now never used.

> +				fi
>  			else
>  				echo "The \$BUILDSTAMP variable is empty"
>  				exit 1
> diff --git a/live-build/functions b/live-build/functions
> index 695344e..99c4708 100644
> --- a/live-build/functions
> +++ b/live-build/functions
> @@ -970,13 +970,6 @@ configure_oci() {
>      Chroot ${chroot} "chmod +x /usr/sbin/policy-rc.d"

configure_oci can be updated now to not need a second argument as it is now never used.

>  
>  
> -    # Inject a build stamp into the image
> -    mkdir -p ${chroot}/etc/cloud
> -    cat > ${chroot}/etc/cloud/build.info << EOF
> -serial: $serial
> -EOF
> -
> -
>      # https://github.com/docker/docker/blob/9a9fc01af8fb5d98b8eec0740716226fadb3735c/contrib/mkimage/debootstrap#L54-L56
>      Chroot ${chroot} "dpkg-divert --local --rename --add /sbin/initctl"
>      cp -a ${chroot}/usr/sbin/policy-rc.d ${chroot}/sbin/initctl


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