preunpackfs: Fixes