From mboxrd@z Thu Jan  1 00:00:00 1970
From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=)
Subject: [PATCH] Making /dev/kvm optional
Date: Fri, 21 Mar 2014 13:54:53 +0100
Message-ID: <87d2hf4spu.fsf@gnu.org>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
Return-path: <nix-dev-bounces@lists.science.uu.nl>
List-Unsubscribe: <http://lists.science.uu.nl/mailman/listinfo/nix-dev>,
	<mailto:nix-dev-request@lists.science.uu.nl?subject=unsubscribe>
List-Archive: <http://lists.science.uu.nl/pipermail/nix-dev>
List-Post: <mailto:nix-dev@lists.science.uu.nl>
List-Help: <mailto:nix-dev-request@lists.science.uu.nl?subject=help>
List-Subscribe: <http://lists.science.uu.nl/mailman/listinfo/nix-dev>,
	<mailto:nix-dev-request@lists.science.uu.nl?subject=subscribe>
Sender: nix-dev-bounces@lists.science.uu.nl
Errors-To: nix-dev-bounces@lists.science.uu.nl
To: nix-dev <nix-dev@cs.uu.nl>
Cc: guix-devel <guix-devel@gnu.org>
List-Id: guix-devel.gnu.org

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

Hello,

The daemon now creates /dev deterministically (thanks!).  However, it
expects /dev/kvm to be present.

The patch below restricts that requirement (1) to Linux-based systems,
and (2) to systems where /dev/kvm already exists.

I=E2=80=99m not sure about the way to handle (2).  We could special-case
/dev/kvm and create it (instead of bind-mounting it) in the chroot, so
it=E2=80=99s always available; however, it wouldn=E2=80=99t help much since=
 most likely,
if /dev/kvm missing, then KVM support is missing.

Thoughts?

Thanks,
Ludo=E2=80=99.


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

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 973e7a1..e846995 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -2020,7 +2020,10 @@ void DerivationGoal::initChild()
                 createDirs(chrootRootDir + "/dev/pts");
                 Strings ss;
                 ss.push_back("/dev/full");
-                ss.push_back("/dev/kvm");
+#ifdef __linux__
+                if (pathExists("/dev/kvm"))
+                    ss.push_back("/dev/kvm");
+#endif
                 ss.push_back("/dev/null");
                 ss.push_back("/dev/random");
                 ss.push_back("/dev/tty");

--=-=-=
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev

--=-=-=--