changing order as devicemap was referenced before filled, and update-grub wasn't executed when building an AVF image