exec diagnostic wrapper for stage1

Last two commits are of interest, just building upon the stage1 make refactoring.

https://github.com/coreos/rocket/issues/286