Detect and enforce the chroot architecture when updating
Fixups and simplifications for ubuntu/debian.