Resync image tweaks with contrib/mkimage/debootstrap