diff --git a/debian/changelog b/debian/changelog index 055f59d2..17cb8e51 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.664.6) focal; urgency=medium + + [ Patrick Wu ] + * Fix xrdp support in hyper-v images. LP: #1890980. + + -- Steve Langasek Wed, 26 Aug 2020 14:06:31 -0700 + livecd-rootfs (2.664.5) focal; urgency=medium [ Robert C Jennings ] diff --git a/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary b/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary index 72ab45ed..23697b8e 100644 --- a/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary +++ b/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary @@ -55,8 +55,8 @@ EOF CHANGED_FILE_SUFFIX=.replaced-by-desktop-img-build -# use vsock transport. -sed -i${CHANGED_FILE_SUFFIX} -e 's/use_vsock=false/use_vsock=true/g' "${scratch_d}/etc/xrdp/xrdp.ini" +# use vsock transport +sed -i${CHANGED_FILE_SUFFIX} -e 's/port=3389/port=vsock:\/\/-1:3389/g' "${scratch_d}/etc/xrdp/xrdp.ini" # use rdp security. sed -i${CHANGED_FILE_SUFFIX} -e 's/security_layer=negotiate/security_layer=rdp/g' "${scratch_d}/etc/xrdp/xrdp.ini" # remove encryption validation. @@ -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" + # use the script to setup the ubuntu session sed -i${CHANGED_FILE_SUFFIX} -e 's/startwm/startubuntu/g' "${scratch_d}/etc/xrdp/sesman.ini" @@ -100,6 +103,15 @@ ResultInactive=no ResultActive=yes EOF +cat >${scratch_d}/etc/polkit-1/localauthority/50-local.d/46-allow-update-repo.pkla <