Commit graph

130 commits

Author SHA1 Message Date
Ludovic Courtès
5d159f8a06 runInGenericVM: Use whatever the current system is.
svn path=/nixpkgs/trunk/; revision=32970
2012-03-10 11:44:47 +00:00
Ludovic Courtès
2f01e58e61 vmTools: Use stdenv's glibc in `initrd-utils'.
svn path=/nixpkgs/trunk/; revision=32878
2012-03-08 09:40:45 +00:00
Eelco Dolstra
5e4c7aa8f3 * This substitution causes bash to hang. Urgh. Bash's pattern
substitutions aren't very reliable.

svn path=/nixpkgs/trunk/; revision=32830
2012-03-06 18:49:44 +00:00
Yury G. Kudryashov
5144a19987 svn merge ^/nixpkgs/trunk
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Eelco Dolstra
f680a3c175 * Put back the Ubuntu 10.10 images that I accidentally removed.
svn path=/nixpkgs/trunk/; revision=32141
2012-02-08 11:38:46 +00:00
Eelco Dolstra
c303784a89 * Debian 6.0.4.
svn path=/nixpkgs/trunk/; revision=32112
2012-02-07 13:19:03 +00:00
Eelco Dolstra
78ab1dd995 * Added Fedora 16 images.
svn path=/nixpkgs/trunk/; revision=32110
2012-02-07 13:14:25 +00:00
Eelco Dolstra
b22276deea * Add disk images for Ubuntu 11.10.
svn path=/nixpkgs/trunk/; revision=32109
2012-02-07 12:38:32 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Eelco Dolstra
c044d7f56f * Forgot a few utillinuxng references.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30866
2011-12-13 12:57:32 +00:00
Eelco Dolstra
4d0b546566 * Update Debian Squeeze to 6.0.3.
svn path=/nixpkgs/trunk/; revision=30310
2011-11-07 23:05:50 +00:00
Rob Vermaas
40f1e4e289 * rpm-closure.pl: add possibility to use multiple repositories
* default.nix: do not assume fixed filesystem type when mounting, to allow using other filesystems


svn path=/nixpkgs/trunk/; revision=29757
2011-10-11 13:22:09 +00:00
Ludovic Courtès
e1fb6adbe8 Update Debian Lenny (5.0.9).
svn path=/nixpkgs/trunk/; revision=29699
2011-10-06 13:27:58 +00:00
Eelco Dolstra
eb9a0145ea * Don't mount the entire host filesystem, but just /nix/store and a
temporary directory.  This is necessary to isolate NixOS VMs from
  the host filesystem for security.

svn path=/nixpkgs/trunk/; revision=28427
2011-08-09 14:05:40 +00:00
Eelco Dolstra
b6d96e9782 * For building Fedora disk images, use the "Everything" repo rather
than the "Fedora" repo, since the latter doesn't contain some
  packages (like perl-DBD-SQLite).

svn path=/nixpkgs/trunk/; revision=28389
2011-08-08 14:01:16 +00:00
Eelco Dolstra
4e7e83a7ee * Debian Squeeze updated to 6.0.2.1.
svn path=/nixpkgs/trunk/; revision=28385
2011-08-08 13:16:20 +00:00
Eelco Dolstra
aa5646ff3b * For some reason Samba insists on setting the g+w bit on newly
created directories, which is a security risk.  So create $out with
  the proper permissions before starting the VM.

svn path=/nixpkgs/trunk/; revision=27095
2011-05-02 14:55:16 +00:00
Eelco Dolstra
377b97a37b * Drop the unnecessary boot=on flag.
svn path=/nixpkgs/trunk/; revision=26104
2011-02-24 21:48:32 +00:00
Eelco Dolstra
167c520570 * Added Debian 6.0 and Ubuntu 10.10.
svn path=/nixpkgs/trunk/; revision=25968
2011-02-14 16:52:32 +00:00
Rob Vermaas
81019cbdb9 vmTools: add some arguments with previous defaults
svn path=/nixpkgs/trunk/; revision=25742
2011-02-01 12:11:05 +00:00
Rob Vermaas
ebf9889a9e extractmtdfs: bigger size mtdram, extractfs: support cramfs
svn path=/nixpkgs/trunk/; revision=25739
2011-01-31 18:02:46 +00:00
Rob Vermaas
06be15cb76 add hfs/hfsplus/squashfs support to extractfs
svn path=/nixpkgs/trunk/; revision=25737
2011-01-31 15:26:03 +00:00
Eelco Dolstra
7f4a312e35 * Handle FreeBSD filesystems.
svn path=/nixpkgs/trunk/; revision=25624
2011-01-19 10:59:26 +00:00
Rob Vermaas
ba23376718 added vm function to extract some filesystem
svn path=/nixpkgs/trunk/; revision=25622
2011-01-19 09:06:12 +00:00
Eelco Dolstra
04ec671c8a * Run smbd in its own session / process group (setsid) because smbd
now kills its process group when it exits.  Without setsid, this
  ends up killing the parent (i.e., the builder).
* Use port 445 instead of 139 because the CIFS kernel module tries
  port 445 first.  If there is an actual Samba running on the host, it
  would end up connecting to that one instead of our own and fail.

svn path=/nixpkgs/trunk/; revision=25017
2010-12-06 19:03:32 +00:00
Rob Vermaas
f26b267858 fix debian lenny hashes
svn path=/nixpkgs/trunk/; revision=24986
2010-12-06 08:03:11 +00:00
Rob Vermaas
a074da499c vm/default.nix: updating debian lenny hashes
svn path=/nixpkgs/trunk/; revision=23674
2010-09-07 14:33:46 +00:00
Eelco Dolstra
3cdc3c4abe * Mark the VM builds as requiring KVM support.
svn path=/nixpkgs/trunk/; revision=23526
2010-08-29 21:27:06 +00:00
Rob Vermaas
105d0e540b startSamba: reintroduce force user option set to current user
svn path=/nixpkgs/trunk/; revision=23242
2010-08-19 08:31:13 +00:00
Rob Vermaas
fa7ec152db revert earlier change
svn path=/nixpkgs/trunk/; revision=23222
2010-08-18 11:03:36 +00:00
Rob Vermaas
b2c12ca3e9 added 'force user = root' to smb.conf to prevent permissions problems in vms caused by unknown uids
svn path=/nixpkgs/trunk/; revision=23220
2010-08-18 10:13:48 +00:00
Eelco Dolstra
1df1f9faac * Debian 5.0.5.
svn path=/nixpkgs/trunk/; revision=22654
2010-07-19 07:55:18 +00:00
Eelco Dolstra
3d442ad185 * Apply a patch that is apparently required to make the kernel work
properly on Amazon EC2.
* Always apply the CIFS timeout patch.  It's rather annoying to have
  to build a separate kernel for the VM tests.

svn path=/nixpkgs/trunk/; revision=22630
2010-07-18 21:10:46 +00:00
Eelco Dolstra
b3bd6e9eee * Doh.
svn path=/nixpkgs/trunk/; revision=22350
2010-06-20 23:24:52 +00:00
Eelco Dolstra
cb5bcfa04a * In the VM tests, apply a patch to increase the 15s timeout on CIFS
operations to 120s.  This is necessary if the host is heavily
  loaded.  For instance, in the Hydra build farm, if there are many
  concurrent jobs, VM builds often fail because they hit the timeout.

svn path=/nixpkgs/trunk/; revision=22347
2010-06-20 20:52:08 +00:00
Eelco Dolstra
0f77615483 svn path=/nixpkgs/trunk/; revision=22333 2010-06-18 19:57:11 +00:00
Eelco Dolstra
7a1dde5d25 * Fix the download of discontinued openSUSE releases.
svn path=/nixpkgs/trunk/; revision=22324
2010-06-18 11:49:57 +00:00
Eelco Dolstra
124f4dc7dd * Doh.
svn path=/nixpkgs/trunk/; revision=22289
2010-06-16 06:56:12 +00:00
Eelco Dolstra
1626db66f5 * Make the script to start Samba available to the VM stuff in NixOS.
* Use socat's "exec" and "nofork" options to reduce the number of
  processes.  Also, if smbd exits abnormally, exit from the smbd
  restart loop.

svn path=/nixpkgs/trunk/; revision=22279
2010-06-15 16:13:10 +00:00
Eelco Dolstra
22f7cf6976 svn path=/nixpkgs/trunk/; revision=22266 2010-06-14 18:42:52 +00:00
Eelco Dolstra
98dff00f52 * Clean up diskImages/diskImageFuns/diskImageExtraFuns.
svn path=/nixpkgs/trunk/; revision=22265
2010-06-14 18:42:18 +00:00
Eelco Dolstra
ef674da49e * Cleanup the definition of `diskImages' using mapAttrs.
svn path=/nixpkgs/trunk/; revision=22263
2010-06-14 17:34:02 +00:00
Eelco Dolstra
c0d2c74038 * Added Ubuntu 10.04 "Lucid".
svn path=/nixpkgs/trunk/; revision=22261
2010-06-14 17:05:26 +00:00
Eelco Dolstra
81fa7ae7b2 * Added Fedora 13.
svn path=/nixpkgs/trunk/; revision=22259
2010-06-14 16:48:36 +00:00
Eelco Dolstra
b570419efa * Urgh, if $TMPDIR is very long we run into the 108 character limit on
Unix domain socket paths.  So use ./samba instead of $TMPDIR/samba.

svn path=/nixpkgs/trunk/; revision=22256
2010-06-14 11:18:57 +00:00
Eelco Dolstra
cc27927f8a * Hack to prevent the socat process from hanging the builder.
svn path=/nixpkgs/trunk/; revision=22251
2010-06-14 07:39:13 +00:00
Eelco Dolstra
88a5d8915a * Support repeated mounting of the CIFS share. Necessary because the
mount tends to timeout if the host is heavily loaded.

svn path=/nixpkgs/trunk/; revision=22250
2010-06-14 00:18:54 +00:00
Eelco Dolstra
1f8e6d4814 * The -smb flag in QEMU/KVM is unreliable: it doesn't work without the
-no-kvm-irqchip flag, and on the Hydra machines only works on the
  rather old KVM 76.  So as a workaround, don't use -smb, but use
  QEMU's "guestfwd" feature to forward 10.0.2.4:139 in the guest to a
  Unix domain socket on the host connected to Samba.
* Use "cache=writeback" to improve performance a lot.
* Use "werror=report" to make QEMU crash instead of hang if the host
  filesystem is full.

svn path=/nixpkgs/trunk/; revision=22249
2010-06-13 23:49:16 +00:00
Eelco Dolstra
6dddd07402 * vmTools: don't use klibc anymore. Just use utillinux/bash/etc.
svn path=/nixpkgs/trunk/; revision=22209
2010-06-10 12:28:04 +00:00
Eelco Dolstra
b8c2a1bebe svn path=/nixpkgs/trunk/; revision=22125 2010-06-03 14:29:12 +00:00