[Merge] ~jchittum/livecd-rootfs:main-fix-riscv64-conditional into livecd-rootfs:ubuntu/master

[Steve Langasek]

Side point, if you have to write more than two [ == ] blocks in an if, it's better to use case.
-- 
https://code.launchpad.net/~jchittum/livecd-rootfs/+git/livecd-rootfs/+merge/440645
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~jchittum/livecd-rootfs:main-fix-riscv64-conditional into livecd-rootfs:ubuntu/master.