squashme: base-image-setup tweaks