Commit graph

103 commits

Author SHA1 Message Date
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
Eelco Dolstra 8e0860b5ca * Debian 4.0 updated to r9.
svn path=/nixpkgs/trunk/; revision=22079
2010-06-01 10:44:36 +00:00
Lluís Batlle i Rossell 9bcb6277f3 Changing linux kernel references from vmlinuz to bzImage.
This way we get a simpler kernel build script.

svn path=/nixpkgs/trunk/; revision=20094
2010-02-18 11:34:48 +00:00
Eelco Dolstra a617a7c239 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19786
2010-02-03 14:23:43 +00:00
Eelco Dolstra 1c92df1384 * Debian 5.0.4.
svn path=/nixpkgs/trunk/; revision=19748
2010-02-01 15:17:34 +00:00
Lluís Batlle i Rossell bcba809460 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19654
2010-01-25 18:52:07 +00:00
Eelco Dolstra b3625c242b * Add the ext3 module to the initrd. The Amazon image generator needs
it.

svn path=/nixpkgs/trunk/; revision=19585
2010-01-20 21:09:33 +00:00
Lluís Batlle i Rossell 3e10ba6bb9 Fixing an evaluation error: kernelPackages -> linuxPackages
svn path=/nixpkgs/branches/stdenv-updates/; revision=19077
2009-12-22 09:23:17 +00:00
Eelco Dolstra 798c6f3960 * Include the ext2 and unix modules in the initrd.
* Don't assume that /dev/vda has major 253, since that's not always
  the case.
* Use Linux 2.6.32.

svn path=/nixpkgs/trunk/; revision=19031
2009-12-18 12:10:35 +00:00
Eelco Dolstra b2c9e50203 * Added Fedora 12. This requires the latest RPM, because the RPMs are
compressed with xz.

svn path=/nixpkgs/trunk/; revision=18868
2009-12-09 22:35:46 +00:00
Eelco Dolstra 519e7870b6 * Move `modifyDerivation' from build-support/vm to lib and rename it
to `overrideDerivation'.

svn path=/nixpkgs/trunk/; revision=18466
2009-11-19 16:43:58 +00:00
Eelco Dolstra d843b24fbe * Added Ubuntu 9.10 ("Karmic Koala").
svn path=/nixpkgs/trunk/; revision=18142
2009-11-05 14:49:17 +00:00
Rob Vermaas 3653e372b0 dash as default shell for debian/ubuntu systems
svn path=/nixpkgs/trunk/; revision=17590
2009-10-02 09:34:37 +00:00
Rob Vermaas c2fe94783d svn path=/nixpkgs/trunk/; revision=17588 2009-10-02 09:11:42 +00:00
Rob Vermaas a00a2ffdba add functions for adding extra virtual packges to images, leave old one for backw.compatibility for now
svn path=/nixpkgs/trunk/; revision=17561
2009-10-01 07:49:55 +00:00
Rob Vermaas 4d5141bd2c extra deb/rpm changes
svn path=/nixpkgs/trunk/; revision=17560
2009-10-01 07:25:50 +00:00
Eelco Dolstra 23c0f1c25e * Added openSUSE 11.1.
svn path=/nixpkgs/trunk/; revision=17397
2009-09-24 07:40:30 +00:00
Eelco Dolstra 36df4d3bc2 svn path=/nixpkgs/trunk/; revision=17387 2009-09-23 20:46:22 +00:00
Eelco Dolstra f467c6d131 * Retry CIFS mounts a few times. Hopefully this fixes problems such
as in http://hydra.nixos.org/build/79029 (i.e. "CIFS VFS: No
  response for cmd 114 mid 1", "CIFS VFS: cifs_mount failed w/return
  code = -112").

svn path=/nixpkgs/trunk/; revision=17365
2009-09-23 15:17:47 +00:00
Eelco Dolstra 251c7207cf * Revert to KVM 76 in the VM build functions. The latest qemu-kvm has
weird performance and data corruption regressions in the build farm.

svn path=/nixpkgs/trunk/; revision=17364
2009-09-23 14:24:37 +00:00
Eelco Dolstra 15c8ec03a0 svn path=/nixpkgs/trunk/; revision=17248 2009-09-18 14:07:52 +00:00
Eelco Dolstra 04c225a4c7 * Debian 5.0.3.
svn path=/nixpkgs/trunk/; revision=17247
2009-09-18 14:05:45 +00:00
Eelco Dolstra 0b063ec39f * Use qemu-kvm.
svn path=/nixpkgs/trunk/; revision=17243
2009-09-18 10:42:50 +00:00
Rob Vermaas 0806854b24 changed mem size for rpm/deb build vms, added version specific packages for fedora9++
svn path=/nixpkgs/trunk/; revision=16136
2009-07-02 12:53:25 +00:00
Eelco Dolstra 674211ac9d * Revive klibc 1.5 for now since vmtools still uses its insmod.
svn path=/nixpkgs/trunk/; revision=16040
2009-06-25 08:22:51 +00:00
Eelco Dolstra cee3ca1228 svn path=/nixpkgs/trunk/; revision=15909 2009-06-09 14:32:31 +00:00
Eelco Dolstra d8cc981d90 * Fedora 11. Completely untested.
svn path=/nixpkgs/trunk/; revision=15907
2009-06-09 14:10:16 +00:00
Rob Vermaas a46e339352 typo
svn path=/nixpkgs/trunk/; revision=15846
2009-06-03 19:20:13 +00:00