[Merge] ~samirakarioh/livecd-rootfs:add-metadata-rocks into livecd-rootfs:ubuntu/master

[Cristovao Cordeiro]

Review: Needs Fixing



Diff comments:

> diff --git a/live-build/functions b/live-build/functions
> index 3de9857..d96fead 100644
> --- a/live-build/functions
> +++ b/live-build/functions
> @@ -931,6 +932,18 @@ configure_oci() {
>      echo 'exit 101' >> ${chroot}/usr/sbin/policy-rc.d
>      Chroot ${chroot} "chmod +x /usr/sbin/policy-rc.d"
>  
> +
> +    # If the chroot exist, create a folder /etc/cloud and add a build.info file in it with the serial of the image
> +    if [ -d "${chroot}" ]; then

the assertion should actually happen earlier in the function, cause there are others lines making use of it...so if something is to fail, it will fail before and this check will not be useful

> +        mkdir -p ${chroot}/etc/cloud
> +        cat > ${chroot}/etc/cloud/build.info << EOF
> +serial: $serial
> +EOF
> +    else
> +        echo "Chroot not exist"

pls fix the grammar

> +        exit 1
> +    fi
> +
>      # 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/~samirakarioh/livecd-rootfs/+git/livecd-rootfs/+merge/430736
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~samirakarioh/livecd-rootfs:add-metadata-rocks into livecd-rootfs:ubuntu/master.