[Merge] ~waveform/livecd-rootfs:general-tidy into livecd-rootfs:ubuntu/master

[Dave Jones]

> Trying to decide whether I think a 20+-line awk script is an improvement in
> maintainability over sed line noise.  In the meantime, a minor suggestion
> inline for making the awk script more succinct.

Heh, well to be pedantic the sed isn't used at all because the subsequent cat just clobbers its output anyway. Still, I think that's a bug in itself (as it results in throwing away the boot partition mount on raspi images, though the fact that's not added later is another bug IMO, which I've got another commit that corrects later but ... I'm getting off topic).

I admit the awk is ... verbose. I could collapse it down into considerably fewer lines (there's no requirement for all those statements to be on separate lines) and ditch all the commentary, but I'd much rather have maintainable code than line noise. Nonetheless, I agree with the suggestion!
-- 
https://code.launchpad.net/~waveform/livecd-rootfs/+git/livecd-rootfs/+merge/450874
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/master.