Finish of move to new image-spec vs base-image.

Make sure we actually run the minimal setup on CONTAINER, not the
LXC-SERVER. doh.