Fix line continuation in write_partition_layout().
Remove variable test that is no longer needed.

Sponsored by:	The FreeBSD Foundation
Fix scheme flag to mkimg(1).

Sponsored by:	The FreeBSD Foundation