From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44166) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cufxI-0002V7-Kb 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 1cufxF-0000Rb-8t for guix-patches@gnu.org; Sun, 02 Apr 2017 09:54:08 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:58371) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cufxF-0000R3-4w for guix-patches@gnu.org; Sun, 02 Apr 2017 09:54:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cufxE-0000br-U4 for guix-patches@gnu.org; Sun, 02 Apr 2017 09:54:04 -0400 Subject: bug#26339: [PATCH 08/18] bootloader: Stop using grub module. Resent-Message-ID: From: Mathieu Othacehe Date: Sun, 2 Apr 2017 15:52:32 +0200 Message-Id: <20170402135242.2958-8-m.othacehe@gmail.com> In-Reply-To: <20170402135242.2958-1-m.othacehe@gmail.com> References: <20170402135242.2958-1-m.othacehe@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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.scm (%public-modules): Replace grub by bootloader. * gnu/tests.scm (define-module): Ditto. * gnu/tests/nfs.scm (define-module): Ditto. * gnu/tests/web.scm (define-module): Ditto. --- gnu.scm | 3 ++- gnu/tests.scm | 3 ++- gnu/tests/nfs.scm | 3 ++- gnu/tests/web.scm | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu.scm b/gnu.scm index 932e4cdd5..56b84b74d 100644 --- a/gnu.scm +++ b/gnu.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016 Ludovic Courtès ;;; Copyright © 2015 Joshua S. Grant +;;; Copyright © 2017 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -34,7 +35,7 @@ '((gnu system) (gnu system mapped-devices) (gnu system file-systems) - (gnu system grub) ; 'grub-configuration' + (gnu system bootloader) (gnu system pam) (gnu system shadow) ; 'user-account' (gnu system linux-initrd) diff --git a/gnu/tests.scm b/gnu/tests.scm index e84d1ebb2..25c7c3fd3 100644 --- a/gnu/tests.scm +++ b/gnu/tests.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017 Ludovic Courtès +;;; Copyright © 2017 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,7 +22,7 @@ #:use-module (guix utils) #:use-module (guix records) #:use-module (gnu system) - #:use-module (gnu system grub) + #:use-module (gnu system bootloader) #:use-module (gnu system file-systems) #:use-module (gnu system shadow) #:use-module (gnu services) diff --git a/gnu/tests/nfs.scm b/gnu/tests/nfs.scm index 1f28f5a5b..432fc83a1 100644 --- a/gnu/tests/nfs.scm +++ b/gnu/tests/nfs.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Ludovic Courtès ;;; Copyright © 2016 John Darrington +;;; Copyright © 2017 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,7 +21,7 @@ (define-module (gnu tests nfs) #:use-module (gnu tests) #:use-module (gnu system) - #:use-module (gnu system grub) + #:use-module (gnu system bootloader) #:use-module (gnu system file-systems) #:use-module (gnu system shadow) #:use-module (gnu system vm) diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm index cdc579123..0e98a128c 100644 --- a/gnu/tests/web.scm +++ b/gnu/tests/web.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Ludovic Courtès +;;; Copyright © 2017 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,7 +20,6 @@ (define-module (gnu tests web) #:use-module (gnu tests) #:use-module (gnu system) - #:use-module (gnu system grub) #:use-module (gnu system file-systems) #:use-module (gnu system shadow) #:use-module (gnu system vm) -- 2.12.2