[Merge] ~davidkrauser/livecd-rootfs/+git/livecd-rootfs:ubuntu/master into livecd-rootfs:ubuntu/master

[Robert C Jennings]

Review: Needs Fixing

Hey David, the implementation looks good.  I'd like to see comments added to the file we're dropping in the images.

I would like to see the commit message tweaked to include the package version in addition to the commit id.  The development is done in lp:livecd-rootfs but it also get's mirrored in https://git.launchpad.net/ubuntu/+source/livecd-rootfs by the Server Dev import team based on archive package contents.  In that context the commit ID won't be informative.  Also, the version will be helpful in writing a changelog entry where the commit id won't.

Thanks David!

Diff comments:

> diff --git a/live-build/functions b/live-build/functions
> index 483fc80..34c17c0 100644
> --- a/live-build/functions
> +++ b/live-build/functions
> @@ -962,6 +962,25 @@ replace_kernel () {
>      force_boot_without_initramfs ${mountpoint}
>  }
>  
> +track_initramfs_boot_fallback() {
> +    mountpoint=$1
> +    cat <<"END" > "${mountpoint}/etc/grub.d/01_track_initrdless_boot_fallback"
> +#! /bin/sh
> +set -e

I would like to see comments added in the file for end-users to explain the purpose of this hook and where it is coming from (for the later part this is the IMG_STR "This file was created by the Image build process")

> +cat <<"EOF"
> +if [ -n "${have_grubenv}" ]; then
> +  if [ -n "${initrdfail}" ]; then
> +    set initrdless_boot_fallback_triggered="${initrdfail}"
> +  else
> +    set initrdless_boot_fallback_triggered=0
> +  fi
> +  save_env initrdless_boot_fallback_triggered
> +fi
> +EOF
> +END
> +    chmod +x "${mountpoint}/etc/grub.d/01_track_initrdless_boot_fallback"
> +}
> +
>  force_boot_without_initramfs() {
>      mountpoint=$1
>  


-- 
https://code.launchpad.net/~davidkrauser/livecd-rootfs/+git/livecd-rootfs/+merge/387862
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~davidkrauser/livecd-rootfs/+git/livecd-rootfs:ubuntu/master into livecd-rootfs:ubuntu/master.