From mboxrd@z Thu Jan  1 00:00:00 1970
From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=)
Subject: bug#28445: match-error in 'device-sexp->device' while building system
Date: Sun, 17 Sep 2017 21:51:18 +0200
Message-ID: <874ls1gl3d.fsf@gnu.org>
References: <87y3pid5jw.fsf@netris.org> <871snafw35.fsf@fastmail.com>
	<87ingmcmwm.fsf@netris.org>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
Return-path: <bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:49245)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1dtfbr-0002ha-Hy
	for bug-guix@gnu.org; Sun, 17 Sep 2017 15:52:11 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1dtfbm-0001S5-DZ
	for bug-guix@gnu.org; Sun, 17 Sep 2017 15:52:07 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:36606)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1dtfbm-0001Rz-9B
	for bug-guix@gnu.org; Sun, 17 Sep 2017 15:52:02 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1dtfbm-00089i-24
	for bug-guix@gnu.org; Sun, 17 Sep 2017 15:52:02 -0400
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-Message-ID: <handler.28445.B28445.150567789831321@debbugs.gnu.org>
In-Reply-To: <87ingmcmwm.fsf@netris.org> (Mark H. Weaver's message of "Wed, 13
	Sep 2017 17:24:25 -0400")
List-Id: Bug reports for GNU Guix <bug-guix.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/bug-guix>,
	<mailto:bug-guix-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-guix/>
List-Post: <mailto:bug-guix@gnu.org>
List-Help: <mailto:bug-guix-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/bug-guix>,
	<mailto:bug-guix-request@gnu.org?subject=subscribe>
Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org
Sender: "bug-Guix" <bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org>
To: Mark H Weaver <mhw@netris.org>
Cc: 28445@debbugs.gnu.org

--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

Hello,

Apologies for not chiming in earlier!

Mark H Weaver <mhw@netris.org> skribis:

> At least for some transition period, it would be good to find a way to
> cope with (store (device #f)) in some older system generations.
>
> What do you think?

I think the patch below, which is Marius=E2=80=99 patch + adjusts
=E2=80=98read-boot-parameters=E2=80=99 to cope with #f store-device, should=
 solve the
issue.

Could you check if it works for you?

Thanks, and sorry for the delay!

Ludo=E2=80=99.


--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline

diff --git a/gnu/system.scm b/gnu/system.scm
index c4404f593..528527ba9 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -278,6 +278,8 @@ directly by the user."
 
       (store-device
        (match (assq 'store rest)
+         (('store ('device #f) _ ...)
+          root-device)
          (('store ('device device) _ ...)
           (device-sexp->device device))
          (_                                       ;the old format
@@ -902,6 +904,7 @@ device in a <menu-entry>."
   (case (file-system-title fs)
     ((uuid) (file-system-device fs))
     ((label) (file-system-device fs))
+    ((device) (file-system-device fs))
     (else #f)))
 
 (define (operating-system-boot-parameters os system.drv root-device)

--=-=-=--