Sorry for the slow reply. Launchpad bug report messages seem to end up in my junk folder. I currently don't use the pi at the moment so can't test the patch immediately (are you aiming for the 20.04 release?). The patch testing for the raspberry pi seems sensible. My only issue with your patch is dropping the "defaults". This seems to always be applied in pi images, but I've no clue if it is redundant.
Sorry for the slow reply. Launchpad bug report messages seem to end up in my junk folder. I currently don't use the pi at the moment so can't test the patch immediately (are you aiming for the 20.04 release?). The patch testing for the raspberry pi seems sensible. My only issue with your patch is dropping the "defaults". This seems to always be applied in pi images, but I've no clue if it is redundant.