From 90d23ed9df33e35e157fecd8ab60f55e716ca42f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 6 Oct 2017 23:09:48 +0200 Subject: system: Really filter out Linux device names for the store. This is a followup to db4e8fd5d4a07d3be8ce68fb96722ef7077c0eee. Fixes . Reported by Mark H Weaver . * gnu/system.scm (ensure-not-/dev): New procedure. (read-boot-parameters)[ensure-not-/dev]: Remove. (operating-system-boot-parameters): Use it. --- gnu/system.scm | 15 +++++++++------ 1 file 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 @@ (define-record-type* (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 object or #f if the format is unrecognized." @@ -243,11 +251,6 @@ (define device-sexp->device ((? 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 @@ (define (operating-system-boot-parameters os system.drv root-device) (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) -- cgit v1.2.3