From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:54534) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jSnkx-0005W9-3u for guix-patches@gnu.org; Sun, 26 Apr 2020 16:20:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jSnkw-0001dH-4V for guix-patches@gnu.org; Sun, 26 Apr 2020 16:20:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51710) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jSnkv-0001dC-Om for guix-patches@gnu.org; Sun, 26 Apr 2020 16:20:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jSnkv-0005HO-L3 for guix-patches@gnu.org; Sun, 26 Apr 2020 16:20:01 -0400 Subject: [bug#40879] [PATCH] gnu: linux-boot: Allow to mount the root file system via nfs Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:47204) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jSmqc-0000H1-Md for guix-patches@gnu.org; Sun, 26 Apr 2020 15:21:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jSmqb-0001og-Ks for guix-patches@gnu.org; Sun, 26 Apr 2020 15:21:50 -0400 Received: from vsmx011.vodafonemail.xion.oxcs.net ([153.92.174.89]:53619) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jSmqa-0001oH-Uw for guix-patches@gnu.org; Sun, 26 Apr 2020 15:21:49 -0400 Received: from vsmx003.vodafonemail.xion.oxcs.net (unknown [192.168.75.197]) by mta-5-out.mta.xion.oxcs.net (Postfix) with ESMTP id 7AC9259D175 for ; Sun, 26 Apr 2020 19:21:42 +0000 (UTC) Received: from macbook-pro.kuh-wiese.my-router.de (unknown [2.206.251.67]) by mta-7-out.mta.xion.oxcs.net (Postfix) with ESMTPA id 5B5B2539A58 for ; Sun, 26 Apr 2020 19:21:40 +0000 (UTC) From: Stefan Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Message-Id: <29B6FCE4-CD82-4BEA-A00B-9D1C6EAFE4A9@vodafonemail.de> Date: Sun, 26 Apr 2020 21:21:38 +0200 Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) 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: 40879@debbugs.gnu.org * gnu/build/linux-boot.scm (boot-system) Treat a root option with ":/" = as an nfs source and avoid to call 'canonicalize-device-spec' for it. --- gnu/build/linux-boot.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm index 4fb711b8f2..05e833c0c6 100644 --- a/gnu/build/linux-boot.scm +++ b/gnu/build/linux-boot.scm @@ -534,10 +534,13 @@ upon error." ;; The "--root=3DSPEC" kernel command-line option always = provides a ;; string, but the string can represent a device, a UUID, = or a ;; label. So check for all three. - (let ((root (cond ((string-prefix? "/" root) root) - ((uuid root) =3D> identity) - (else (file-system-label root))))) - (mount-root-file-system (canonicalize-device-spec root) + (let ((device-spec (cond ((string-prefix? "/" root) root) + ((uuid root) =3D> identity) + ((string-contains root ":/") #f) ; = nfs + (else (file-system-label root))))) + (mount-root-file-system (if device-spec + (canonicalize-device-spec = device-spec) + root) root-fs-type #:volatile-root? volatile-root? #:flags root-fs-flags --=20 2.26.0