[PATCH] Making /dev/kvm optional

[PATCH] Making /dev/kvm optional

[Ludovic Courtès]

[-- Attachment #1: Type: text/plain, Size: 546 bytes --]

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’m 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’s always available; however, it wouldn’t help much since most likely,
if /dev/kvm missing, then KVM support is missing.

Thoughts?

Thanks,
Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 625 bytes --]

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");

[-- Attachment #3: Type: text/plain, Size: 149 bytes --]

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

Re: [PATCH] Making /dev/kvm optional

[Ludovic Courtès]

ludo@gnu.org (Ludovic Courtès) skribis:

> 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.

The patch is in:

  https://github.com/NixOS/nix/commit/24cb65efc3c34e24fc653779a4d42cf4f31c6737

Thanks!

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

Re: [PATCH] Making /dev/kvm optional

[Andreas Enge]

On Sat, Mar 22, 2014 at 03:21:34PM +0100, Ludovic Courtès wrote:
> > The patch below restricts that requirement (1) to Linux-based systems,
> > and (2) to systems where /dev/kvm already exists.
> The patch is in:
>   https://github.com/NixOS/nix/commit/24cb65efc3c34e24fc653779a4d42cf4f31c6737

Can we rapidly apply it to the guix daemon?

Andreas

Re: [PATCH] Making /dev/kvm optional

[Ludovic Courtès]

Andreas Enge <andreas@enge.fr> skribis:

> On Sat, Mar 22, 2014 at 03:21:34PM +0100, Ludovic Courtès wrote:
>> > The patch below restricts that requirement (1) to Linux-based systems,
>> > and (2) to systems where /dev/kvm already exists.
>> The patch is in:
>>   https://github.com/NixOS/nix/commit/24cb65efc3c34e24fc653779a4d42cf4f31c6737
>
> Can we rapidly apply it to the guix daemon?

It’s already applied.  So:

  git pull && (cd nix ; ./sync-with-upstream)

Ludo’.