Simplify setupBaseImage() even further. Move some more code in a separate function. Pure code reorganization. No functionality change. Signed-off-by: Vivek Goyal <vgoyal@redhat.com> Upstream-commit: 0fcd485626f110bbf39e8a6b1edc11b4ac6f7065 Component: engine