diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-01-21 22:45:54 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-01-22 00:02:52 +0100 |
| commit | 6b779207ee627c93fc0dad18ef67c149024fa535 (patch) | |
| tree | 9a4fa6759add87f0bcd943e72bddae960e749a82 /Makefile.am | |
| parent | 3738d8700ff84e16bfd8609efbd4db6933b414f1 (diff) | |
| download | guix-6b779207ee627c93fc0dad18ef67c149024fa535.tar guix-6b779207ee627c93fc0dad18ef67c149024fa535.tar.gz | |
system: grub: Search root device by label or UUID if possible.
Fixes <http://bugs.gnu.org/22281>.
Reported by Christopher Allan Webber <cwebber@dustycloud.org>.
* gnu/system/grub.scm (eye-candy): Add 'root-fs' parameter. Replace
'search --file' command in the output with whatever 'grub-root-search'
returns.
(grub-root-search): New procedure.
(grub-configuration-file): Add 'store-fs' parameter. Use
'grub-root-search' instead of hard-coded 'search --file' commands.
* gnu/system.scm (store-file-system,
operating-system-store-file-system): New procedures.
(operating-system-grub.cfg): Use it, and adjust call to
'grub-configuration-file'.
* tests/system.scm: New file.
* Makefile.am (SCM_TESTS): Add it.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 7e41990cac..1ede6d4057 100644 --- a/Makefile.am +++ b/Makefile.am @@ -240,6 +240,7 @@ SCM_TESTS = \ tests/challenge.scm \ tests/cve.scm \ tests/file-systems.scm \ + tests/system.scm \ tests/services.scm \ tests/containers.scm \ tests/import-utils.scm |