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

[David Krauser]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

On Mon, Jun 03, 2019 at 03:42:39PM -0000, Robert C Jennings wrote:
> Diff comments:
> 
> > -#imagesize=${IMAGE_SIZE:-$((2252*1024**2))}  # 2.2G (the current size we ship)
> 
> This was included previously to keep the math present in the file.  As part of moving to livecd-rootfs we moved from bash to sh, and the later doesn't support power notation '**' so added the following line but kept this one.  I think it should stay.

Added a comment back in.
 
> > +        IMAGE_STR="# Ubuntu Desktop"
> 
> This image string is placed in files so that support and users can find files that have been altered by our build process (as they are unpackaged changes).  This string isn't unique enough and doesn't convey how a file with this string was created/altered in the way that the default below does.  Can you update this string to make it easy to grep and convey the same information?  Thanks.

Changed this to:

# DESKTOP_IMG: This file was created/modified by the Desktop Image build process

> >      cat << EOF >> "mountpoint/etc/fstab"
> >  LABEL=UEFI	/boot/efi	vfat	defaults	0 0
> > +LABEL=$FS_LABEL	/		ext4	defaults	0 0
> 
> Have you tested this change with the ubuntu-cpc project images?

The ubuntu-cpc images seem to work, but there may be a duplicate entry in fstab. (An entry is also added in 999-cpc-fixes.chroot)

Moved this logic to the hyperv hook.

> > +chroot "${scratch_d}" apt-get update -y
> > +chroot "${scratch_d}" apt-get -y install xrdp linux-tools-virtual linux-cloud-tools-virtual
> 
> apt-get clean should be run to shrink the image and remove stale archive info as we do for other images.

apt-get clean is run on line 102

> > +# disable bitmap compression since its local its much faster
> > +sed -i_orig -e 's/bitmap_compression=true/bitmap_compression=false/g' "${scratch_d}/etc/xrdp/xrdp.ini"
> 
> These are creating files with '_orig' suffix for each change.  That's a bit generic.  Is there something you can use instead to convey that the backup file was created during image build?

Using the .replaced-by-desktop-img-build suffix instead. Also made sure we use this suffix consistently through the build.

> > +# Configure the policy xrdp session
> > +cat > ${scratch_d}/etc/polkit-1/localauthority/50-local.d/45-allow-colord.pkla << EOF
> 
> ${IMAGE_STR} if supported by the file format.  (and a few more places below)

Added ${IMAGE_STR} where appropriate.

> > +qemu-img convert -O vhdx "$raw_img" "$vhd_img"
> 
> rm $raw_img

Removed.

> > +apt-get install zip
> 
> apt-get install -y zip

Added -y flag.

> > +zip "$vhd_img.zip" "$vhd_img"
> 
> rm $vhd_img

Removed.

> > new file mode 100644
> > index 0000000..72cf707
> > --- /dev/null
> > +++ b/live-build/ubuntu/hooks/999-undivert-update-initramfs.chroot
> 
> I think this needs to be documented to explain why this is needed.

Doesn't look like it's needed. Removed
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEmH3vroRq5++HovSghahH9Fon0iwFAlz1hrYACgkQhahH9Fon
0iw9DBAAyOyZn7ZjC3Mj2gXRO3ftHE0TDNfPRkH5hXxwglffq2vxepWJxJlWX3gM
QnlboUKTVBNiHPz2uqhORRlBRRLstz/SkyMnrxLEmNNNgVADS5WlKjOfYpO17AsY
CEQJaAMmDhAcFNCVSPb1KVZUUxxx1KzeIJQ45ui2Svgd5KN4ELOm1jKZmFYzQ92F
Renc4VZ3ttx2zd67y7Hj8Kndxej018S37WqZomAEltuKHFwzBAPUB3A1Oxu6vuvr
jzGZgbnRNKHc0CoDk3X5aZwByVdaTgKPEUjwEjkjjb4Zf/eQaXHRnaCV/IXJ5QhP
/01WTO7m+Dkj+TSTweZSRI79lUzz2TsSb5N7Cw09x/C1ewTYR9KcKDIkRsyd/lWZ
IJqOPPcMKIIikCqaopNLB3Zcwc4Dtzhfcb1TGT6J2uh/KPAD3J+1uIkG/LA/T9M4
EpjAtJQWBxrdZI4rb6h5aHVbSs9J6k4Lir6huPF5eyWehEli2HO5xU2XVhXWyCyx
pdQP5tDFORJQVBH3Au7GC2xyTXP8/HmAABEQMEciKojnUH6iwjc10oThut36Ums5
U2VP4VQHzOtYVzPsKlOVg5DfokvfpcxOr76RVd3mAVTM3rwJQcf5K2gc8sHp4gto
gWksYfKLpY9pDlD8kW02UDTURgZrPsJW8SikSGsHP6DtyvI5gD8=
=zlkU
-----END PGP SIGNATURE-----

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