From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44149) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cufxH-0002UI-Tt for guix-patches@gnu.org; Sun, 02 Apr 2017 09:54:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cufxH-0000VV-0j for guix-patches@gnu.org; Sun, 02 Apr 2017 09:54:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:58375) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cufxG-0000V1-TZ for guix-patches@gnu.org; Sun, 02 Apr 2017 09:54:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cufxG-0000cL-MJ for guix-patches@gnu.org; Sun, 02 Apr 2017 09:54:06 -0400 Subject: bug#26339: [PATCH 12/18] system: Rename grub-device to fs->boot-device. Resent-Message-ID: From: Mathieu Othacehe Date: Sun, 2 Apr 2017 15:52:36 +0200 Message-Id: <20170402135242.2958-12-m.othacehe@gmail.com> In-Reply-To: <20170402135242.2958-1-m.othacehe@gmail.com> References: <20170402135242.2958-1-m.othacehe@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 26339@debbugs.gnu.org * gnu/system.scm (grub-device): Rename to fs->boot-device, (operating-system-grub.cfg): adapt, (operating-system-parameters-file): ditto. --- gnu/system.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 9775e5be8..118816255 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -755,7 +755,7 @@ populate the \"old entries\" menu." (boot-device boot-device) ;; The device where the kernel and initrd live. - (store-device (grub-device store-fs)) + (store-device (fs->boot-device store-fs)) (store-mount-point (file-system-mount-point store-fs)) @@ -771,7 +771,7 @@ populate the \"old entries\" menu." ((bootloader-configuration-file-procedure (operating-system-bootloader os)) (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) @@ -804,7 +804,7 @@ configurations." (boot-device #$boot-device) (boot-type #$boot-type) (store - (device #$(grub-device store)) + (device #$(fs->boot-device store)) (mount-point #$(file-system-mount-point store)))) #:set-load-path? #f))) -- 2.12.2