Commit Graph

2893 Commits

Author SHA1 Message Date
Eelco Dolstra
e90a1cfc59 * A quick hack to enable debugging of VM test scripts: the test script
is now made available in the interactive test driver.  For instance,
  you can do

  $ nix-build tests/ -A quake3.driver
  $ ./result/bin/nixos-test-driver
  > eval $ENV{'testScript'};
  ... see VMs + X11 + Quake get started, bots running around ...
  >

  So after this you can run commands interactively on the VMs in the
  state they were in after the conclusion of the test script.

svn path=/nixos/trunk/; revision=25158
2010-12-16 19:35:43 +00:00
Eelco Dolstra
dac1936869 * If $DISPLAY is set (i.e. in interactive mode), show QEMU's graphical
output.

svn path=/nixos/trunk/; revision=25157
2010-12-16 16:58:06 +00:00
Eelco Dolstra
445827ad45 * Added a convenience derivation for running the test driver
interactively on a network specification.  For instance:

  $ nix-build tests/ -A quake3.driver
  $ ./result/bin/nixos-test-driver
  > startAll;
  client1: starting vm
  client1: QEMU running (pid 14971)
  server: starting vm
  server: QEMU running (pid 14982)
  ...
  > $client1->execute("quake3 ...");

* Use the GNU readline library in interactive mode.

svn path=/nixos/trunk/; revision=25156
2010-12-16 15:54:15 +00:00
Eelco Dolstra
8496dbf350 * Absolutize the path to the VM start script.
svn path=/nixos/trunk/; revision=25154
2010-12-16 13:53:17 +00:00
Yury G. Kudryashov
aaf3247e80 Add cups_pdf_filter to default drivers list
svn path=/nixos/trunk/; revision=25153
2010-12-15 22:36:54 +00:00
Yury G. Kudryashov
bedc715ecd Be more verbose
svn path=/nixos/trunk/; revision=25152
2010-12-15 22:36:39 +00:00
Eelco Dolstra
ec16a59845 * Support file uploads in MediaWiki.
svn path=/nixos/trunk/; revision=25145
2010-12-15 13:21:21 +00:00
Eelco Dolstra
0887471e4e * Mediawiki 1.15.5.
svn path=/nixos/trunk/; revision=25144
2010-12-15 12:53:44 +00:00
Eelco Dolstra
6039c22da4 svn path=/nixos/trunk/; revision=25141 2010-12-15 12:10:17 +00:00
Evgeny Egorochkin
652a22f0da Ghost One: packaged.
svn path=/nixos/trunk/; revision=25136
2010-12-15 02:19:44 +00:00
Eelco Dolstra
37a9ffffb0 * Provide a default hostname and deployment target equal to the
attribute name of the machine in the model.  This allows
  networking.hostName and deployment.targetHost to be omitted for
  typical networks.

svn path=/nixos/trunk/; revision=25125
2010-12-14 13:36:54 +00:00
Eelco Dolstra
332f0418f7 * Make `services.sshd.enable' an alias rather than an obsolete option.
It's really an abstract configuration option that specifies that *some*
  SSH daemon should be enabled (which could be OpenSSH).

svn path=/nixos/trunk/; revision=25119
2010-12-14 11:48:07 +00:00
Eelco Dolstra
47157986f2 * Unbreak the NixOS installer tests.
svn path=/nixos/trunk/; revision=25096
2010-12-13 08:53:43 +00:00
Sander van der Burg
281f3b0776 Fixed the avahi service and do some better formatting of the key=value pairs
svn path=/nixos/trunk/; revision=25060
2010-12-10 23:58:57 +00:00
Sander van der Burg
b3c4444c26 The targetHost property defaults to the hostName of the system if not defined
svn path=/nixos/trunk/; revision=25057
2010-12-10 15:39:41 +00:00
Sander van der Burg
e51fcac73c - deployment.targetHost is now defined as an option
- developed services.disnix.infrastructure option, which contains properties for the Disnix infrastructure model (these properties can be either used by Disnix itself or the Avahi publisher)


svn path=/nixos/trunk/; revision=25052
2010-12-10 14:22:00 +00:00
Tobias Hammerschmidt
05c25d3fb2 check for broadcom wireless driver - patch by Vladimír Čunát
svn path=/nixos/trunk/; revision=25045
2010-12-09 19:08:33 +00:00
Eelco Dolstra
ef243b7fc2 * Fix a syntax error in the sleep hook that broke suspend.
svn path=/nixos/trunk/; revision=25038
2010-12-08 19:46:52 +00:00
Sander van der Burg
c318bd097e Fixed the --no-out-link option
svn path=/nixos/trunk/; revision=25034
2010-12-08 14:30:55 +00:00
Sander van der Burg
11d2cd78e0 - deployment.targetHost is now used for connecting to remote hosts instead of deployment.hostname. This makes more sense.
- fixed error in the manual (nixos-deploy-network => nixos-build-vms)


svn path=/nixos/trunk/; revision=25031
2010-12-07 20:13:50 +00:00
Sander van der Burg
9df8293d63 Wrote manual pages for the nixos-deploy-network and nixos-build-vms commands
svn path=/nixos/trunk/; revision=25030
2010-12-07 16:33:18 +00:00
Eelco Dolstra
2e38d8cd31 * ZOMG, fixed a giant bug in the networking of distributed VM tests.
It turns out that all network interfaces in all VMs had the same
  Ethernet address (52:54:00:12:34:56) because we didn't specify any
  with the macaddr=... option.  This can obviously lead to great
  confusion.  For instance, when a router forwards a packet, it can
  actually end up sending the packet to itself because the target
  machine has the same Ethernet address (causing a loop until the TTL
  expires), while the target *also* receives the packet.  It's amazing
  anything worked at all, really.

  So now we just set the Ethernet addresses to 52:54:00:12:<virtual
  network number>:<machine number>.

svn path=/nixos/trunk/; revision=25020
2010-12-07 00:44:29 +00:00
Sander van der Burg
755c30c7a2 - nixos-deploy-network no longer uses an infrastructure model => use nixpkgs.system and deployment.hostname instead
- implemented --no-out-link option so that invoking these tools from scripts leave no garbage behind
- some misc. cleanups


svn path=/nixos/trunk/; revision=25019
2010-12-06 22:02:37 +00:00
Eelco Dolstra
796b48c367 * 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=/nixos/trunk/; revision=25016
2010-12-06 19:02:24 +00:00
Eelco Dolstra
8e168edebc * Increase the number of loopback devices from the default (8),
which is way too small because every VM virtual disk requires
  a loopback device.

svn path=/nixos/trunk/; revision=24988
2010-12-06 09:54:08 +00:00
Lluís Batlle i Rossell
d5fb41795f Adding a wake on lan module.
svn path=/nixos/trunk/; revision=24958
2010-12-02 20:23:45 +00:00
Eelco Dolstra
651a38019d * nixos-deploy-network: build the deploy script locally as an
optimisation and workaround for Nix/210.

svn path=/nixos/trunk/; revision=24956
2010-12-02 18:09:53 +00:00
Eelco Dolstra
e97a3d9cb6 * Fix incorrect path to switch-to-configuration.
svn path=/nixos/trunk/; revision=24955
2010-12-02 17:22:24 +00:00
Eelco Dolstra
29813b418c * Don't run dhclient on Xen's vif* and tap* interfaces.
svn path=/nixos/trunk/; revision=24948
2010-12-01 16:14:44 +00:00
Eelco Dolstra
1b8dd6cf27 * "systemConfig" doesn't exist anymore.
svn path=/nixos/trunk/; revision=24947
2010-12-01 12:36:19 +00:00
Eelco Dolstra
1c451d351f * Make the location of the database configurable.
svn path=/nixos/trunk/; revision=24888
2010-11-26 22:50:57 +00:00
Lluís Batlle i Rossell
25b9c03571 Updating from trunk (specially for the enableFontDir option, as it was not up
to date for nixpkgs)


svn path=/nixos/branches/stdenv-updates/; revision=24871
2010-11-26 14:16:12 +00:00
Lluís Batlle i Rossell
bef46f1553 Moving which to type -P, so 'which ls', 'which time', ... work.
svn path=/nixos/trunk/; revision=24862
2010-11-26 09:57:38 +00:00
Eelco Dolstra
636307c62b * Create /var/lib/nfs/v4recovery.
svn path=/nixos/trunk/; revision=24858
2010-11-25 16:51:07 +00:00
Sander van der Burg
b064f5c80e The Disnix avahi server now also publishes the 'system' attribute and the properties defined in config.deployment
svn path=/nixos/trunk/; revision=24849
2010-11-24 23:00:52 +00:00
Sander van der Burg
31b8ac8120 Implemented 'deployment' option to capture custom attributes related to the system configuration
svn path=/nixos/trunk/; revision=24848
2010-11-24 23:00:21 +00:00
Evgeny Egorochkin
2224d78b33 network-interfaces: MAC address support take 2: now it seems to work
svn path=/nixos/trunk/; revision=24847
2010-11-24 22:58:53 +00:00
Evgeny Egorochkin
72422d4126 network-interfaces: support changing MAC addresses of interfaces
svn path=/nixos/trunk/; revision=24846
2010-11-24 22:58:48 +00:00
Evgeny Egorochkin
50d8698fd8 network-interfaces: cleanup
svn path=/nixos/trunk/; revision=24845
2010-11-24 22:58:42 +00:00
Yury G. Kudryashov
f58efe3336 Add kdm user. Kdm doesn't work here without kdm user
svn path=/nixos/trunk/; revision=24835
2010-11-24 10:45:34 +00:00
Michael Raskin
1b41b6d16d Fix Monit startOn parameter
svn path=/nixos/trunk/; revision=24832
2010-11-24 06:13:37 +00:00
Eelco Dolstra
c958902d44 * Added an option "nixpkgs.system" to specify the system type for
which NixOS should be built.  This is useful in NixOS network
  specifications, because it allows machines in the network to have
  different types, e.g.,

    {
      machine1 =
        { config, pkgs, ... }:
        { nixpkgs.system = "i686-linux";
          ... other config ...
        };

      machine2 =
        { config, pkgs, ... }:
        { nixpkgs.system = "x86_64-linux";
          ... other config ...
        };
    }

  It can also be useful in distributed NixOS tests.

svn path=/nixos/trunk/; revision=24823
2010-11-23 16:07:00 +00:00
Sander van der Burg
fcf53be5bd The DisnixWebService is also published through Avahi
svn path=/nixos/trunk/; revision=24792
2010-11-21 16:04:26 +00:00
Sander van der Burg
ad48c7c534 Initial implementation for the Disnix avahi publisher
svn path=/nixos/trunk/; revision=24789
2010-11-21 13:28:48 +00:00
Michael Raskin
c77c3ab22c Remove ttmkfdir reference
svn path=/nixos/trunk/; revision=24662
2010-11-11 13:24:37 +00:00
Nicolas Pierron
30943d2dc0 Fix nixos-option, accept long arguments.
svn path=/nixos/trunk/; revision=24631
2010-11-09 18:42:59 +00:00
Lluís Batlle i Rossell
f319ca67c5 Trying to improve the message hit by new users, if they use the 2.6.36
kernelPackages and don't disable the ttyBackgrounds. Some users got confused by
the previous message.


svn path=/nixos/trunk/; revision=24612
2010-11-06 18:13:48 +00:00
Rob Vermaas
f34d7250b3 mysql-backup.nix: add option to use single transaction for dumps
svn path=/nixos/trunk/; revision=24594
2010-11-04 08:13:57 +00:00
Eelco Dolstra
cf84a44272 * Use buildEnv with a postBuild hook rather than buildEnvScript.
svn path=/nixos/trunk/; revision=24593
2010-11-03 22:37:39 +00:00
Sander van der Burg
4858ab9da8 The DisnixWebService is now also part of the systemPackages so that a user can invoke the client tool from the command-line
svn path=/nixos/trunk/; revision=24564
2010-11-02 04:20:37 +00:00