From 7085ca9690f6b3838ae3dc0f832c30e41681e835 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 15 Apr 2017 14:37:01 +0200 Subject: [PATCH] system: Rename (internal) grub-device to fs->boot-device. * gnu/system.scm (grub-device): Rename to... (fs->boot-device): ... this. (operating-system-grub.cfg): Adapt. (operating-system-parameters-file): Adapt. Signed-off-by: Danny Milosavljevic --- gnu/system.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 369dc20b8f..69cbc8a081 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -746,7 +746,7 @@ (define* (operating-system-bootcfg os #:optional (old-entries '())) (label label) ;; The device where the kernel and initrd live. - (device (grub-device store-fs)) + (device (fs->boot-device store-fs)) (device-mount-point (file-system-mount-point store-fs)) @@ -761,7 +761,7 @@ (define* (operating-system-bootcfg os #:optional (old-entries '())) (grub-configuration-file (operating-system-bootloader os) entries #:old-entries old-entries))) -(define (grub-device fs) +(define (fs->boot-device fs) "Given FS, a object, return a value suitable for use as the device in a ." (case (file-system-title fs) @@ -787,7 +787,7 @@ (define (operating-system-parameters-file os) #$(operating-system-kernel-arguments os)) (initrd #$initrd) (store - (device #$(grub-device store)) + (device #$(fs->boot-device store)) (mount-point #$(file-system-mount-point store)))) #:set-load-path? #f)))