[Merge] ~callmepk/livecd-rootfs/+git/livecd-rootfs:hyper-v-fix into livecd-rootfs:ubuntu/master

[Steve Langasek]

Review: Needs Information



Diff comments:

> diff --git a/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary b/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary
> index 72ab45e..5bc066c 100644
> --- a/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary
> +++ b/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary
> @@ -74,6 +74,9 @@ exec /etc/xrdp/startwm.sh
>  EOF
>  chmod a+x "${scratch_d}/etc/xrdp/startubuntu.sh"
>  
> +# set to use the system Window manager
> +sed -i${CHANGED_FILE_SUFFIX} -e 's/EnableUserWindowManager=true/EnableUserWindowManager=0/g' "${scratch_d}/etc/xrdp/sesman.ini"
> +

This is a conffile belonging to the xrdp package (as is /etc/xrdp/xrdp.ini - but that's an existing problem and not a regression).  This means that on upgrades of the xrdp package (such as between Ubuntu releases), this will cause conffile prompts for users.  We should not modify conffiles as part of a livecd-rootfs build when we can avoid it.  Is there any way to change these settings in a different file instead of the conffile?  Should the default in the xrdp package be changed?

>  # use the script to setup the ubuntu session
>  sed -i${CHANGED_FILE_SUFFIX} -e 's/startwm/startubuntu/g' "${scratch_d}/etc/xrdp/sesman.ini"
>  


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