diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-10-06 23:09:48 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-10-07 00:05:18 +0200 |
| commit | 90d23ed9df33e35e157fecd8ab60f55e716ca42f (patch) | |
| tree | 48a698b848e5662c1b3e24d92fdf9e99663d343d /gnu/system.scm | |
| parent | 5266ff719e274056cb3e2b9740183f0063177255 (diff) | |
| download | gnu-guix-90d23ed9df33e35e157fecd8ab60f55e716ca42f.tar gnu-guix-90d23ed9df33e35e157fecd8ab60f55e716ca42f.tar.gz | |
system: Really filter out Linux device names for the store.
This is a followup to db4e8fd5d4a07d3be8ce68fb96722ef7077c0eee.
Fixes <https://bugs.gnu.org/28445>.
Reported by Mark H Weaver <mhw@netris.org>.
* gnu/system.scm (ensure-not-/dev): New procedure.
(read-boot-parameters)[ensure-not-/dev]: Remove.
(operating-system-boot-parameters): Use it.
Diffstat (limited to 'gnu/system.scm')
| -rw-r--r-- | gnu/system.scm | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index 8ab4801b74..0e834ba5ed 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -231,6 +231,14 @@ directly by the user." (kernel-arguments boot-parameters-kernel-arguments) (initrd boot-parameters-initrd)) +(define (ensure-not-/dev device) + "If DEVICE starts with a slash, return #f. This is meant to filter out +Linux device names such as /dev/sda, and to preserve GRUB device names and +file system labels." + (if (and (string? device) (string-prefix? "/" device)) + #f + device)) + (define (read-boot-parameters port) "Read boot parameters from PORT and return the corresponding <boot-parameters> object or #f if the format is unrecognized." @@ -243,11 +251,6 @@ directly by the user." ((? string? device) device))) - (define (ensure-not-/dev device) - (if (and (string? device) (string-prefix? "/" device)) - #f - device)) - (match (read port) (('boot-parameters ('version 0) ('label label) ('root-device root) @@ -939,7 +942,7 @@ kernel arguments for that derivation to <boot-parameters>." (operating-system-user-kernel-arguments os))) (initrd initrd) (bootloader-name bootloader-name) - (store-device (fs->boot-device store)) + (store-device (ensure-not-/dev (fs->boot-device store))) (store-mount-point (file-system-mount-point store)))))) (define (device->sexp device) |