From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38155) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7p6c-0000jd-5L for guix-patches@gnu.org; Mon, 08 May 2017 16:18:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7p6Y-0003ci-Si for guix-patches@gnu.org; Mon, 08 May 2017 16:18:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:57590) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d7p6Y-0003ca-P9 for guix-patches@gnu.org; Mon, 08 May 2017 16:18:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d7p6Y-0005qp-I7 for guix-patches@gnu.org; Mon, 08 May 2017 16:18:02 -0400 Subject: bug#26339: [PATCH] system: Remove circular dependency between (gnu system) and (gnu system grub). Resent-Message-ID: From: Danny Milosavljevic Date: Mon, 8 May 2017 22:16:55 +0200 Message-Id: <20170508201655.31097-1-dannym@scratchpost.org> In-Reply-To: <874lwvku5q.fsf@gnu.org> References: <874lwvku5q.fsf@gnu.org> 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, ludo@gnu.org Followup to 087efec496b91e3763be2e11e208d4a8f4ef3d43. * gnu/system.scm: (operating-system-bootcfg): Refer to (gnu system grub) by module-ref. --- gnu/system.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index baba0b5df..9fc6cc5e7 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -847,9 +847,11 @@ populate the \"old entries\" menu." (uuid->string (file-system-device root-fs)) (file-system-device root-fs))) (entry (operating-system-boot-parameters os system root-device))) - ((@@ (gnu system grub) grub-configuration-file) (operating-system-bootloader os) - (list entry) - #:old-entries old-entries))) + ((module-ref (resolve-interface '(gnu system grub)) + 'grub-configuration-file) + (operating-system-bootloader os) + (list entry) + #:old-entries old-entries))) (define (fs->boot-device fs) "Given FS, a object, return a value suitable for use as the