I've added a `normalize-file' procedure to the attached patch, which simplify producing correct store references in the GRUB configuration file generated. This fixed the GRUB video mode issues reported in a another issue. Thanks! Maxim