diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-08-01 14:30:18 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-08-01 14:35:31 +0200 |
| commit | d077851b7d4c3728811237d6d105b6f9622ae244 (patch) | |
| tree | e90b8a0c928bb37f9accafc601dfa8664f776c7f /pkgs/build-support | |
| parent | f155a35d7d8562b1da40a7e0b4265829d54455bd (diff) | |
| download | nixlib-d077851b7d4c3728811237d6d105b6f9622ae244.tar nixlib-d077851b7d4c3728811237d6d105b6f9622ae244.tar.gz nixlib-d077851b7d4c3728811237d6d105b6f9622ae244.tar.bz2 nixlib-d077851b7d4c3728811237d6d105b6f9622ae244.tar.lz nixlib-d077851b7d4c3728811237d6d105b6f9622ae244.tar.xz nixlib-d077851b7d4c3728811237d6d105b6f9622ae244.tar.zst nixlib-d077851b7d4c3728811237d6d105b6f9622ae244.zip | |
VM builds: Use the default kernel
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 2821fc0a099d..b0911fd99c34 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1,5 +1,5 @@ { pkgs -, kernel ? pkgs.linux_3_9 +, kernel ? pkgs.linux , img ? "bzImage" , rootModules ? [ "virtio_pci" "virtio_blk" "virtio_balloon" "ext4" "unix" "9p" "9pnet_virtio" ] @@ -114,14 +114,14 @@ rec { echo "mounting Nix store..." mkdir -p /fs/nix/store - mount -t 9p store /fs/nix/store -o trans=virtio,version=9p2000.L,msize=262144,cache=fscache + mount -t 9p store /fs/nix/store -o trans=virtio,version=9p2000.L,msize=262144,cache=loose mkdir -p /fs/tmp mount -t tmpfs -o "mode=755" none /fs/tmp echo "mounting host's temporary directory..." mkdir -p /fs/tmp/xchg - mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,msize=262144,cache=fscache + mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,msize=262144,cache=loose mkdir -p /fs/proc mount -t proc none /fs/proc |