diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-05-13 18:12:12 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-05-13 18:12:12 +0200 |
| commit | 9df603b3008b04313a484aff7924eec370ca968d (patch) | |
| tree | 4ae562e907788f6cbfd37b49b9827f2268d94fb0 /pkgs/build-support/vm | |
| parent | 6fb4c62f25a9f4da1679c9d98f5bfc7c73ff739e (diff) | |
| download | nixlib-9df603b3008b04313a484aff7924eec370ca968d.tar nixlib-9df603b3008b04313a484aff7924eec370ca968d.tar.gz nixlib-9df603b3008b04313a484aff7924eec370ca968d.tar.bz2 nixlib-9df603b3008b04313a484aff7924eec370ca968d.tar.lz nixlib-9df603b3008b04313a484aff7924eec370ca968d.tar.xz nixlib-9df603b3008b04313a484aff7924eec370ca968d.tar.zst nixlib-9df603b3008b04313a484aff7924eec370ca968d.zip | |
Use Linux 3.9 for VM builds
This seems to fix CIFS hangs like: http://hydra.nixos.org/build/4916655
Diffstat (limited to 'pkgs/build-support/vm')
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 202450da1661..aa0592250403 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1,9 +1,9 @@ { pkgs -, linuxKernel ? pkgs.linux +, linuxKernel ? pkgs.linux_3_9 , img ? "bzImage" , rootModules ? [ "cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8" "ext2" "ext3" - "ext4" "unix" "hmac" "md4" "ecb" "des_generic" + "ext4" "unix" "hmac" "md4" "ecb" "des_generic" "sha256" ] }: @@ -98,7 +98,6 @@ rec { args= case $i in */cifs.ko) - args="CIFSMaxBufSize=4194304" ;; esac echo "loading module $(basename $i .ko)" @@ -123,14 +122,14 @@ rec { echo "mounting Nix store..." mkdir -p /fs/nix/store - mount -t cifs //10.0.2.4/store /fs/nix/store -o guest,sec=none + mount -t cifs //10.0.2.4/store /fs/nix/store -o guest,sec=none,sec=ntlm 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 cifs //10.0.2.4/xchg /fs/tmp/xchg -o guest,sec=none + mount -t cifs //10.0.2.4/xchg /fs/tmp/xchg -o guest,sec=none,sec=ntlm mkdir -p /fs/proc mount -t proc none /fs/proc |