[Merge] ~gjolly/livecd-rootfs:cpc/non-cloud into livecd-rootfs:ubuntu/master

[Gauthier Jolly]

Yes the goal is to fix the issue first and then cleanup the code. I can do both at once but that would require more work and testing.
You are right, the new binary hook should be only for raspberry pi and riscv board images and the "old" hook should get rid of this logic. I am happy to re-open an MP just after this one to finalize this work.
-- 
https://code.launchpad.net/~gjolly/livecd-rootfs/+git/livecd-rootfs/+merge/445124
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/master.