Bug#1031195: os-autoinst: FTBFS on several release architectures

[Philip Hands]

Control: reopen -1

It seems that the initial attempt to fix this bug was a failure, so I'm
reopening the bug and will attempt to do a proper job shortly.

Cheers, Phil.