3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

3665 commits

Author SHA1 Message Date
Peter Simons ee2fcb645b modules/services/networking/ssh/sshd.nix: don't write debug output to /tmp/log
svn path=/nixos/trunk/; revision=33925
2012-04-26 08:13:21 +00:00
Eelco Dolstra e6fd0fa893 * Cleanup.
svn path=/nixos/trunk/; revision=33921
2012-04-25 15:44:47 +00:00
Eelco Dolstra 43215ff80f * In the implementation of the ‘authorizedKeys’, don't delete all
lines below a certain marker.  This is undesirable because commands
  like "ssh-copy-id" add keys to the end of the file.  Instead mark
  all automatically added lines individually.

svn path=/nixos/trunk/; revision=33918
2012-04-25 14:14:20 +00:00
Eelco Dolstra e3470145e0 * Fix some links.
svn path=/nixos/trunk/; revision=33910
2012-04-24 15:19:24 +00:00
Eelco Dolstra d4c202b311 * Remove redundant section on building the installation CD.
svn path=/nixos/trunk/; revision=33909
2012-04-24 15:14:26 +00:00
Ludovic Courtès a98ad26fea GNU: Comment `fdisk' out.
svn path=/nixos/trunk/; revision=33907
2012-04-24 12:54:42 +00:00
Eelco Dolstra ac4a059f8a * Put old NixOS configurations in a GRUB submenu. Contributed by
Andreas Källberg.

svn path=/nixos/trunk/; revision=33891
2012-04-23 15:47:03 +00:00
Eelco Dolstra 6c1bb54483 * In the installation CD, make the NixOS/Nixpkgs available as if they
were obtained from the NixOS channel.  "nixos-install" copies this
  to the installed system as well.
* In the installation CD, set GC_INITIAL_HEAP_SIZE to a low value for
  the benefit of memory-constrained environments.

svn path=/nixos/trunk/; revision=33887
2012-04-23 00:41:37 +00:00
Eelco Dolstra 72990dae37 * Add some missing GRUB modules.
svn path=/nixos/trunk/; revision=33886
2012-04-23 00:30:48 +00:00
Eelco Dolstra 9195b1125f * Include the version number in the mingetty greeting line.
svn path=/nixos/trunk/; revision=33884
2012-04-22 23:35:34 +00:00
Eelco Dolstra f1a99bd914 * Subscribe the root user to the NixOS channel by default.
svn path=/nixos/trunk/; revision=33883
2012-04-22 22:43:57 +00:00
Eelco Dolstra d96f330fcf * Slight simplification.
svn path=/nixos/trunk/; revision=33877
2012-04-22 16:28:08 +00:00
Eelco Dolstra d587329615 * Turn users.extraGroups into an attribute set (using types.loaOf).
Also the gid is looked up in ids.gids if not specified.

svn path=/nixos/trunk/; revision=33860
2012-04-20 12:55:09 +00:00
Eelco Dolstra 235ea24ec4 * Remove unused option "user". Not clear what it was supposed to do.
svn path=/nixos/trunk/; revision=33857
2012-04-20 12:22:08 +00:00
Eelco Dolstra d8a6cddbd0 * Fix the installer test (http://hydra.nixos.org/build/2430122).
svn path=/nixos/trunk/; revision=33852
2012-04-20 09:44:27 +00:00
Eelco Dolstra fa50d105d7 * Pass -cpu kvm64 in NixOS VMs (and add a simple regression test for
GMP).

svn path=/nixos/trunk/; revision=33849
2012-04-19 18:56:35 +00:00
Eelco Dolstra 43f43fd185 * Only stop libvirt-guests automatically on system shutdown.
Saving/restoring VMs is disruptive.

svn path=/nixos/trunk/; revision=33844
2012-04-19 15:12:55 +00:00
Arie Middelkoop 0cb5673400 Some additional synaptics settings.
svn path=/nixos/trunk/; revision=33837
2012-04-19 08:29:22 +00:00
Arie Middelkoop 298e0e1829 Some additional xinetd settings.
svn path=/nixos/trunk/; revision=33836
2012-04-19 08:28:54 +00:00
Eelco Dolstra 6ef5e0e5b3 * Fix the GRUB 1 installer test. Note that GRUB 1 doesn't
automatically detect /dev/vd* devices, so users have to fix
  /boot/grub/device.map manually.

svn path=/nixos/trunk/; revision=33832
2012-04-18 16:08:25 +00:00
Eelco Dolstra f8e36664a6 * Subtle: since nix-env processes flags in order, any ‘-I’ flag should
come before ‘-f <nixos>’.

svn path=/nixos/trunk/; revision=33831
2012-04-18 15:01:42 +00:00
Eelco Dolstra cb74284b75 * Handle the case where there is no GRUB 1 splash image.
svn path=/nixos/trunk/; revision=33830
2012-04-18 14:28:30 +00:00
Eelco Dolstra 6f646750cf * Enable the GRUB 1 installer test.
svn path=/nixos/trunk/; revision=33829
2012-04-18 14:17:09 +00:00
Eelco Dolstra 9261d520ff * Fix the installer test.
svn path=/nixos/trunk/; revision=33828
2012-04-18 14:14:58 +00:00
Rob Vermaas be31aebdcf * Added option for EC2 keypair.
* Added workaround for evaluation
* Add support for cluster instances ami generation, only works in us-east-1 
  for now.

    e.g. ./create-ebs-ami.py --region us-east --hvm --key rob
  
  Cluster instances need to have a 8GB EBS backed image with 1 partition 
  and with grub installed. Also HVM images can (currently) only be generated 
  using the CreateImage API call, which requires a running or stopped 
  instance. 



svn path=/nixos/trunk/; revision=33827
2012-04-18 12:36:20 +00:00
Eelco Dolstra b4afefcc40 * Typo.
svn path=/nixos/trunk/; revision=33826
2012-04-18 12:32:17 +00:00
Eelco Dolstra 395d73db70 * nixos-rebuild: don't do a pull of the manifest by default anymore.
It's not necessary when using the NixOS channel.  "nixos-rebuild
  pull" now pulls from the NixOS channel.

svn path=/nixos/trunk/; revision=33825
2012-04-18 11:46:16 +00:00
Eelco Dolstra 6abf3c8a97 * Change $NIXPKGS_CONFIG to a better location (/etc/nix instead of
/nix/etc).  Not sure the default profile should be setting this at
  all though.

svn path=/nixos/trunk/; revision=33824
2012-04-18 10:59:57 +00:00
Eelco Dolstra 7ba5881146 * Don't install the "nixpkgs_sys" symlink in ~/.nix-defexpr anymore.
Note that for attribute-based nix-env installations, the NixOS
  channel contains Nixpkgs as its "pkgs" attribute, so

    $ nix-env -iA nixos.pkgs.foo

  will work instead of the old

    $ nix-env -iA nixpkgs_sys.foo
    
* Fix the path to root's channels installed in ~/.nix-defexpr.

svn path=/nixos/trunk/; revision=33823
2012-04-18 10:58:33 +00:00
Eelco Dolstra a193fe4f1d * Add root's NixOS channel to $NIX_PATH. Will remove
/etc/nixos/{nixos,nixpkgs,services} eventually.

svn path=/nixos/trunk/; revision=33822
2012-04-18 10:34:39 +00:00
Eelco Dolstra e3879fe365 * Store the NixOS version in the top-level derivation.
* Change the name of the top-level derivation from "system" to
  "nixos-<version>".
* Show the NixOS version in the GRUB boot menu instead of the kernel
  version.

svn path=/nixos/trunk/; revision=33785
2012-04-14 17:09:59 +00:00
Eelco Dolstra 91b91cc847 * Set the channel name to "nixos".
svn path=/nixos/trunk/; revision=33783
2012-04-14 14:15:17 +00:00
Mathijs Kwik 3bbaa3b60c slim display manager: enabled auto_login setting
useful for demo/kiosk mode

svn path=/nixos/trunk/; revision=33774
2012-04-13 14:52:25 +00:00
Eelco Dolstra bcc24c1b86 * Finish the EBS creation script. It now takes a --region option to
specify the EC2 region in which the AMI is to be created.  It also
  starts an instance booted from the newly created AMI to test it.

svn path=/nixos/trunk/; revision=33771
2012-04-13 11:26:22 +00:00
Eelco Dolstra 2821289aeb * Ugly hack: force udev to exit to prevent random "Device or resource
busy while trying to open /dev/xvda" errors from fsck.

svn path=/nixos/trunk/; revision=33766
2012-04-12 18:01:19 +00:00
Eelco Dolstra d82a7d328d * Script for creating NixOS EBS-based AMIs.
svn path=/nixos/trunk/; revision=33765
2012-04-12 17:15:55 +00:00
Eelco Dolstra 185e9b69ed * Assume that the ephemeral devices are called /dev/xvda-e. So
in Charon deployments, non-ephemeral devices should be >= /dev/xvdf.

svn path=/nixos/trunk/; revision=33764
2012-04-12 16:48:01 +00:00
Eelco Dolstra f2fd48e131 * Fix the "autocreate" option.
svn path=/nixos/trunk/; revision=33750
2012-04-11 21:21:00 +00:00
Sander van der Burg a34e20e292 deployment attribute does not exists anymore, will fix this later
svn path=/nixos/trunk/; revision=33747
2012-04-11 13:46:49 +00:00
Eelco Dolstra 1d0c23bffb * Use a raw disk for the installer test. This speeds it up by almost
two minutes on my laptop.  Note that due to sparse allocation, raw
  disks don't actually take up more space than qcow2 disks (and
  they're temporary anyway).

svn path=/nixos/trunk/; revision=33746
2012-04-11 10:05:29 +00:00
Eelco Dolstra 375511eb33 * Add a installer test that uses GRUB 1 (it currently fails).
svn path=/nixos/trunk/; revision=33745
2012-04-11 09:42:53 +00:00
Eelco Dolstra e567309d85 * Include all of Nixpkgs.
svn path=/nixos/trunk/; revision=33744
2012-04-11 09:17:32 +00:00
Lluís Batlle i Rossell 918edf8612 I think this makes the memtest module work on grub1.
But I can't test it because grub-install fails for me for grub1.

I tested it works for grub2.


svn path=/nixos/trunk/; revision=33739
2012-04-10 22:20:20 +00:00
Eelco Dolstra fb0a54b803 * In nixos-install, do a nix-pull from
http://nixos.org/releases/nixos/nixos-<version> to ensure we're
  getting the right binaries.

svn path=/nixos/trunk/; revision=33738
2012-04-10 22:17:37 +00:00
Eelco Dolstra 322a0ff7cd * Set the version properly in the source tree in the ISO.
svn path=/nixos/trunk/; revision=33736
2012-04-10 21:42:47 +00:00
Eelco Dolstra 049d2dfca7 * Slight cleanup.
svn path=/nixos/trunk/; revision=33735
2012-04-10 21:19:41 +00:00
Lluís Batlle i Rossell 2ca7e8a43e Reverting 33692, because memtest in the iso was failing.
I set the grub entry for memtest to read "Memtest86", as suggested by Eelco.

I run:
svn merge -c -33692 ^/nixos/trunk
And edited the change a bit.


svn path=/nixos/trunk/; revision=33734
2012-04-10 21:18:48 +00:00
Eelco Dolstra c02240082a * Add missing file.
svn path=/nixos/trunk/; revision=33733
2012-04-10 21:17:43 +00:00
Eelco Dolstra dccd99b564 * Disable "nixos-gen-seccure-keys": it's not clear what it's for, it's
not documented, and it doesn't seem to be used anywhere.

svn path=/nixos/trunk/; revision=33732
2012-04-10 21:11:11 +00:00
Eelco Dolstra 907df082dc * Including the Nixpkgs revision made the ISO volume label slightly
too long.  So make it shorter.

svn path=/nixos/trunk/; revision=33731
2012-04-10 21:08:10 +00:00