system: grub.cfg uses correct file names when store is not in root partition.
authorCarlos Sánchez de La Lama <csanchezdll@gmail.com>
Wed, 14 Sep 2016 14:13:24 +0000 (16:13 +0200)
committerLudovic Courtès <ludo@gnu.org>
Sat, 24 Sep 2016 08:48:13 +0000 (17:48 +0900)
commit0f65f54ebd76324653fd5506a7dab42ee44d9255
tree278735904428790cf55c52ae657acb4f7e5ed743
parentd7b342d81556ddee9e369f78255bc76367a004ae
system: grub.cfg uses correct file names when store is not in root partition.

Fixes <http://bugs.gnu.org/24346>.
Reported by csanchezdll@gmail.com (Carlos Sánchez de La Lama).

* guix/scripts/system.scm (previous-grub-entries): Get the initrd file
name from PARAMS.
* gnu/system.scm (operating-system-grub.cfg): Use
'operating-system-initrd-file' to retrieve the initrd file name.
* gnu/system/grub.scm (strip-mount-point): New procedure.
(grub-configuration-file)[entry->gexp]: Call 'strip-mount-point' for
LINUX and INITRD.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
gnu/system.scm
gnu/system/grub.scm
guix/scripts/system.scm