philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

2216 commits

Author SHA1 Message Date
Shea Levy 315087def1 logstash: use {name=; value='} attrsets for repeated name-value pairs instead of parallel lists 2012-07-11 11:59:00 -04:00
Shea Levy 3039caf5ad Add logstash module. 
Since the logstash config file seemed very similar to a nixexpr, I decided
to map directly from nixexprs to logstash configs. I didn't realize until
too far in that this solution was probably way over-engineered, but it
works.
 2012-07-11 11:22:16 -04:00
Rok Garbas b7398794ed i3 window manager was not installed when enabled 2012-07-10 16:07:53 +02:00
Eelco Dolstra fbf9ecf78a Apache: make /var/run/httpd readable to wwwrun, as required by mod_cgid 2012-07-09 16:27:39 +02:00
Eelco Dolstra d0c9a3ce32 Apache: build PHP against the right httpd 
If httpd is built with a threaded MPM, then PHP needs to be built with
thread support as well.
 2012-07-06 23:28:46 +02:00
Eelco Dolstra 18031e41bb Apache: Add an option to set the MPM 
Supported values are "prefork" (default), "worker" and "event"
(experimental in Apache 2.2 but not 2.4).
 2012-07-06 14:23:55 -04:00
Eelco Dolstra a07eb262a0 Apache: don't fork into the background due to Upstart weirdness 
If Apache crashes during startup, Upstart for some reason shows the
job in the "start/running" state.  As a workaround, don't fork.
 2012-07-06 13:47:42 -04:00
Eelco Dolstra 46dce21bff MediaWiki: Generalise the skins support 
The new option ‘skins’ allows specifying a list of directories
providing skins to be added to the MediaWiki installation.  The
‘defaultSkin’ option just sets the default.
 2012-07-05 21:04:23 +02:00
Mathijs Kwik a630b1f6f6 EFI shell got updated upstream, reflecting new hash 2012-07-05 08:31:44 +02:00
Eelco Dolstra 348691645d Remove broken "nopipefail" option 
http://hydra.nixos.org/build/2751337
 2012-07-02 10:57:36 -04:00
Peter Simons 56373744b4 modules/config/networking.nix: recognize whether a local DNS resolver is available 
resolvconf prefers a locally running BIND resolver over the forwarders; we just
have to tell it whether we have one or not. We use 'config.services.bind.enable'
to make that decision, assuming that people are not going to configure a local
BIND that won't respond to queries on 127.0.0.1. If we run into such a (weird)
case, then we'll need to introduce another variable for that purpose which can
be set independently from 'config.services.bind.enable'.
 2012-07-02 15:01:02 +02:00
Peter Simons f22dbd5e05 modules/services/networking/wpa_supplicant.nix: strip trailing whitespace 2012-06-29 11:53:16 +02:00
Peter Simons 61b8ee9029 modules/services/networking/wpa_supplicant.nix: document that interface auto-detection doesn't work on Linux 3.4.x 2012-06-29 11:53:16 +02:00
Eelco Dolstra bf15293b1e Merge branch 'master' of github.com:NixOS/nixos into systemd 
Conflicts:
	modules/services/hardware/udev.nix
 2012-06-28 14:19:38 -04:00
Eelco Dolstra 76c74cd7c7 initrd: Detect filesystem type before doing fsck/mount 
BusyBox doesn't handle the "auto" filesystem type very well: fsck will
just ignore such filesystems, and mount will only work properly if the
required kernel module is already loaded.  Therefore, use blkid to
determine the filesystem type.

Also generate an /etc/fstab in the initrd rootfs on the fly.  This is
useful if you're dropped into an emergency shell since it allows you
to say "fsck /dev/sda1" or "mount /dev/sda" and have the right thing
happen.
 2012-06-28 10:55:44 -04:00
viric 7acfd8ec20 Merge pull request #9 from viric/pull-pipefail 
nixos-rebuild: make 'pull' fail in case it did not pull anything.
 2012-06-28 01:20:22 -07:00
Lluís Batlle i Rossell 34e8f68056 system-tarball-pc: not use boot.initrd.extraTools anymore 
Eelco removed the option recently, making the default initrd have the full
busybox.

I saw this evaluation error in the hydra nixos trunk page.
 2012-06-27 22:26:27 +02:00
Lluís Batlle i Rossell de87b07bb3 nixos-rebuild: fail if any case of pull fails. 2012-06-27 21:57:15 +02:00
Lluís Batlle i Rossell 5b7c019e2a nixos-rebuild: make 'pull' fail in case it did not pull anything. 2012-06-27 21:36:46 +02:00
David Guibert dbe2325603 fix the grep pattern finding programs called by absolute paths in udev rules. 2012-06-27 20:41:07 +02:00
Shea Levy bb5d2d53fe try isn't used, so use the more compatct seq 10 2012-06-27 09:43:54 -04:00
Mathijs Kwik 061a998840 luks root: c-style for-loop -> seq 
The ash shell no longer supports this bash-specific syntax.
This left systems that use luksroot unable to boot.
 2012-06-27 09:42:55 -04:00
Eelco Dolstra e64bdda52b Don't use weird 777 permissions on unmounted /dev/shm 2012-06-27 09:35:53 -04:00
Eelco Dolstra cc357c7e64 nixos-rebuild: Add a convenience option ‘--upgrade’ 
This is equivalent to running ‘nix-channel --update nixos’ before
running ‘nixos-rebuild’.
 2012-06-25 16:17:34 -04:00
Eelco Dolstra 7613ae950a Fix booting on EC2 
The kill command in ash doesn't know the "--" syntax, but doesn't need
it either.
 2012-06-24 19:02:34 -04:00
Eelco Dolstra bd0f065c05 Merge branch 'master' of github.com:NixOS/nixos into systemd 2012-06-22 18:20:26 -04:00
Eelco Dolstra 6bd32f0a27 Drop the socat wrapper 2012-06-22 15:37:22 -04:00
Eelco Dolstra 1da7cea223 Add Busybox to the installation CD 
This is mostly to get the automated tests to succeed.
 2012-06-22 14:16:55 -04:00
Eelco Dolstra 980ba4d5a5 stage-1: mount /proc, /sys, /dev in the target root 
The switch_root in BusyBox doesn't do this (while the one in
util-linux does).  So we have to do this ourselves.
 2012-06-22 13:51:42 -04:00
Eelco Dolstra 598adfee3e Fix booting from the CD-ROM 
So it turns out that BusyBox doesn't auto-load modules for filesystems
that have type "auto", e.g. it doesn't figure out that it should load
the "iso9660" module should be loaded when mounting the CD-ROM.  We
don't want to give the root FS on the CD type "iso9660", because that
breaks booting from a USB stick created by unetbootin.  So make sure
the "iso9660" module is loaded.
 2012-06-22 11:55:23 -04:00
Eelco Dolstra 7b54922227 Don't include klibc in the installation CD 2012-06-22 11:39:27 -04:00
Eelco Dolstra 872a76b177 Merge branch 'master' of github.com:NixOS/nixos into systemd 2012-06-22 11:11:21 -04:00
Eelco Dolstra 9692495df0 Use BusyBox in the initrd 
Using BusyBox instead of Bash plus a bunch of other tools gives us a
much more feature-full, yet smaller initrd.  In particular, BusyBox
contains networking commands such as ip and a DHCP client, useful for
NFS boots.  It's also much more convenient for rescue situations
because the shell has builtin readline support and there are many more
tools (including vi).
 2012-06-22 10:43:06 -04:00
Eelco Dolstra 70089950d2 nixos-version: "pre-svn" -> "pre-git" 2012-06-22 10:28:06 -04:00
Rob Vermaas df124ebc89 * Make sure time.timeZone can only be defined once. 2012-06-21 12:47:44 +02:00
Eelco Dolstra 055eae2a58 Merge pull request #1 from aszlig/i3_integration 
Add xserver integration of i3 WM.
 2012-06-20 20:49:45 -07:00
Eelco Dolstra 337423af8e Backdoor: depend on /dev/hvc0 
Systemd is the shit: units can declare a dependency on the appearance
of device nodes.  Yay!
 2012-06-19 17:36:02 -04:00
Eelco Dolstra 2fa1ba85c6 Enable the systemd password agents 2012-06-19 17:02:54 -04:00
Eelco Dolstra 2526afb1c7 Don't use ConsoleKit 2012-06-19 16:22:26 -04:00
Eelco Dolstra d692a0807a Don't mount /dev/pts since systemd does that for us 2012-06-19 15:25:56 -04:00
Eelco Dolstra cacd608c37 Mount devtmpfs in the initrd 
It seems that udev now requires devtmpfs, so enable it.
 2012-06-19 15:15:40 -04:00
Eelco Dolstra cd7872b758 Drop dependency on the old udev 2012-06-19 15:14:54 -04:00
Eelco Dolstra dab6bbe3a6 Set the default unit to "graphical.target" if X11 is enabled 2012-06-19 14:51:04 -04:00
Eelco Dolstra 2b305d7f29 Remove accidentally committed line 2012-06-19 14:50:23 -04:00
Eelco Dolstra f213c4ca29 Don't run syslogd and klogd 
The systemd journal removes the need for running syslogd and klogd, so
don't start them.
 2012-06-19 09:28:04 -04:00
Eelco Dolstra 88f94d76bc Use socket-based activation of the Nix daemon 2012-06-18 23:31:07 -04:00
Eelco Dolstra c73d642db2 Don't put quotes around environment values 2012-06-18 23:30:26 -04:00
Eelco Dolstra c3fb248bcb Get rid of the Upstart shutdown job 
The only thing that Upstart's shutdown job did that systemd doesn't do
natively is update the hardware clock.  So added a service for that.
 2012-06-18 18:15:34 -04:00
Eelco Dolstra ca2bd17f54 Whitespace 2012-06-18 17:58:31 -04:00
Eelco Dolstra 9f5051b76c Rename mingetty module to agetty 2012-06-18 17:55:27 -04:00
Eelco Dolstra 4c21857ee1 Upstart ‘boot.systemd.services’ for the Upstart compatibility layer 2012-06-18 17:42:26 -04:00
Eelco Dolstra 352510c208 Add an option ‘boot.systemd.services’ 
This option makes it more convenient to define services because it
automates stuff like setting $PATH, having a pre-start script, and so on.
 2012-06-18 15:28:31 -04:00
Eelco Dolstra 673bf12b1d Improve the dependencies of units generated by the Upstart emulation 2012-06-18 00:22:18 -04:00
Eelco Dolstra 42ee3b4209 Add a ‘wantedBy’ attribute to unit definitions 
This attribute allows a unit to make itself a dependency of another unit.

Also, add an option to set the default target unit.
 2012-06-17 23:31:21 -04:00
Mathijs Kwik bd5b06bf86 synaptics driver: accelleration factor config option 
svn path=/nixos/trunk/; revision=34523
 2012-06-16 11:13:48 +00:00
Eelco Dolstra 4a95f8996b To ease migration to systemd, generate units from the ‘jobs’ option 
Also get rid of the ‘buildHook’ job option because it wasn't very useful.
 2012-06-16 00:19:43 -04:00
Eelco Dolstra 66f4d10843 Use pam_systemd.so to set up device ownership 
This removes the need for ConsoleKit, so it's gone.
 2012-06-15 14:51:48 -04:00
Eelco Dolstra ab86759eb3 Use kmod instead of module-init-tools 2012-06-15 14:18:26 -04:00
Eelco Dolstra 164d6e6ab2 Use udev from systemd 2012-06-15 13:09:22 -04:00
Eelco Dolstra a46894b960 Get lots more systemd stuff working 
Enabled a bunch of units that ship with systemd.  Also added an option
‘boot.systemd.units’ that can be used to define additional units
(e.g. ‘sshd.service’).
 2012-06-14 18:44:56 -04:00
Eelco Dolstra c9be63b83e * Use ‘nologin’ as the default shell for user accounts that are not 
allowed to log in.

svn path=/nixos/trunk/; revision=34514
 2012-06-14 21:33:59 +00:00
Eelco Dolstra fae777c264 Merge branch 'master' of github.com:NixOS/nixos into systemd 2012-06-14 12:02:17 -04:00
Eelco Dolstra fd9604b319 * Oops, fix an incomplete commit. 
svn path=/nixos/trunk/; revision=34488
 2012-06-13 03:28:03 +00:00
Eelco Dolstra 63517eca1b * Actually use the security.pam.enableSSHAgentAuth option. 
http://hydra.nixos.org/build/2698800

svn path=/nixos/trunk/; revision=34483
 2012-06-12 20:21:15 +00:00
Eelco Dolstra 15d44498f9 * Add a ‘size’ option to ‘swapDevices’ to create swapfiles on the fly. 
svn path=/nixos/trunk/; revision=34478
 2012-06-12 13:41:51 +00:00
Eelco Dolstra 03653d43eb * Add support for sudo authentication using the SSH agent. This 
allows password-less servers.

svn path=/nixos/trunk/; revision=34474
 2012-06-11 22:41:07 +00:00
Eelco Dolstra a3118792a5 * Make the ACPI Shutdown command in VirtualBox to do the right thing. 
svn path=/nixos/trunk/; revision=34473
 2012-06-11 22:37:55 +00:00
Lluís Batlle i Rossell a257bf78cb Making the virtualbox-guest module be evaluated only in i686 and x86_64. 
On mips, an assertion in the nixpkgs virtualbox was failing.


svn path=/nixos/trunk/; revision=34464
 2012-06-11 17:31:03 +00:00
Peter Simons 51b5da4023 modules/security/pam.nix: sort security.pam.services alphabetically 
svn path=/nixos/trunk/; revision=34437
 2012-06-11 07:12:41 +00:00
Peter Simons 5c3593be46 Add PAM configuration for vlock. 
svn path=/nixos/trunk/; revision=34436
 2012-06-11 07:12:39 +00:00
Peter Simons 4c54fcaf45 pam security for i3lock 
svn path=/nixos/trunk/; revision=34435
 2012-06-11 07:10:25 +00:00
Peter Simons 25155a02e6 Add findutils dependency for /tmp cleaning. 
This dependency is only added if the setting is activated.

svn path=/nixos/trunk/; revision=34434
 2012-06-11 07:05:15 +00:00
Peter Simons 4931188684 Integrate cleanTmpDir in stage-2-init.sh. 
We're using find in order to remove dotfiles, too.

svn path=/nixos/trunk/; revision=34433
 2012-06-11 07:05:13 +00:00
Peter Simons fbf53168f3 Add new option config.boot.cleanTmpDir. 
This option is to control if the user wants to have its /tmp directory cleaned
up during system boot.

svn path=/nixos/trunk/; revision=34432
 2012-06-11 07:05:11 +00:00
Lluís Batlle i Rossell 9125d3af50 Adding creation of /dev/ptmx in stage-2, in case stage-1 did not run. 
Upstart requires /dev/ptmx since its 1.4, and will lock up in case of it missing.

I was hitting this in the fuloong, where I don't use the nixos initrd.


svn path=/nixos/trunk/; revision=34429
 2012-06-10 22:37:20 +00:00
Lluís Batlle i Rossell 3d2ed19067 Making fcron use the daemonType=fork, instead of foreground. This way logrotate 
does not have to handle it appart.


svn path=/nixos/trunk/; revision=34422
 2012-06-10 15:14:16 +00:00
Lluís Batlle i Rossell 6824f1e082 Making the dovecot2 mail location a nixos option. 
svn path=/nixos/trunk/; revision=34421
 2012-06-10 15:07:25 +00:00
Lluís Batlle i Rossell 9b833aafb9 Fix prayer so it does not start a server at port 80. 
svn path=/nixos/trunk/; revision=34420
 2012-06-10 14:51:43 +00:00
Lluís Batlle i Rossell 78333e5d84 Add a 'named' option to run only for ipv4. 
I remember the 'named' log was giving annoying messages on systems not ipv6
capable (I can't recall if lacking the kernel ipv6 code or unconfigured ipv6
addresses).


svn path=/nixos/trunk/; revision=34419
 2012-06-10 14:50:44 +00:00
Lluís Batlle i Rossell 31f30722d6 Small comment fix on the system-tarball-sheevaplug. 
svn path=/nixos/trunk/; revision=34418
 2012-06-10 14:45:30 +00:00
Lluís Batlle i Rossell c539224a84 Postfix was started before all filesystems were mounted. I add 'filesystem' to startOn. 
svn path=/nixos/trunk/; revision=34416
 2012-06-10 14:36:16 +00:00
Eelco Dolstra 87e06b97a3 * Don't include the hostname in option default values. Default values 
are included in the manual, so this causes a different manual to be
  built for each machine.
* Clean up indentation of cntlm module.

svn path=/nixos/trunk/; revision=34387
 2012-06-08 14:29:31 +00:00
Eelco Dolstra 6aa4120f3a * Shorten the greeting line to make it fit on a 80-character terminal 
again by removing the kernel version.

svn path=/nixos/trunk/; revision=34376
 2012-06-06 23:14:57 +00:00
Eelco Dolstra 593eb83343 * Typo. 
svn path=/nixos/trunk/; revision=34369
 2012-06-06 15:23:20 +00:00
aszlig b78ce79f89 Add xserver integration of i3 WM. 
This allows to set i3 as the default window manager in the system configuration.
 2012-06-04 21:19:12 +02:00
Eelco Dolstra f21aa7d22c First attempt at using systemd 
Basic booting works.  Systemd starts agetty instances on tty1 and
tty2.  Shutdown and journald also work.
 2012-06-04 12:51:48 -04:00
Eelco Dolstra f2a33809c1 * Check for .git instead of .svn. 
svn path=/nixos/trunk/; revision=34350
 2012-06-04 15:57:32 +00:00
Eelco Dolstra a0cc181117 * nixos-checkout: get the NixOS/Nixpkgs sources from GitHub. 
svn path=/nixos/trunk/; revision=34347
 2012-06-04 15:39:07 +00:00
Eelco Dolstra c4c68f97d1 * The volume ID is too long again. Shorten it to make it fit (just 
barely) inside the 32 character limit.

  http://hydra.nixos.org/build/2660387

svn path=/nixos/trunk/; revision=34346
 2012-06-04 15:02:37 +00:00
Eelco Dolstra ca57a8e638 * Add type. 
svn path=/nixos/trunk/; revision=34345
 2012-06-04 14:35:48 +00:00
Eelco Dolstra 9b014c471a * CUPS: fix printing on a Ricoh Aficio MP C4500 PXL printer (and 
probably lots of others).  The $PATH used to invoke the filter
  didn't contain Ghostscript and Perl, so it silently fails.  (A nice
  property of CUPS is that it will just silently discard the job when
  that happens, so you need to set LogLevel to "debug" to see this.)
  Fortunately, CUPS now has a "SetEnv" option to set $PATH explicitly.

  Also, remove config.system.path from the PATH of CUPS' Upstart job.
  It seems to serve no purpose.

svn path=/nixos/trunk/; revision=34244
 2012-05-25 15:51:33 +00:00
Eelco Dolstra f81eb12d41 * Now hopefully a proper fix for the problem in 
http://hydra.nixos.org/build/2645533 (which I can't reproduce btw -
  so much for reproducibility...).

svn path=/nixos/trunk/; revision=34243
 2012-05-25 14:06:46 +00:00
Eelco Dolstra d0786fd3e7 * Cache nix-pull calls in nixos-install. 
svn path=/nixos/trunk/; revision=34241
 2012-05-25 13:32:30 +00:00
Lluís Batlle i Rossell 22fc2bdb24 Fixing the evaluation of the system-tarball-pc. 
It complained that grub device wasn't defined, and I guess it wanted some
fileSystems too. I copied those details from the sheevaplug expression, that I
made evaluate some minutes ago.


svn path=/nixos/trunk/; revision=34238
 2012-05-25 08:09:25 +00:00
Lluís Batlle i Rossell 4157166f8a Making the sheevaplug system tarball evaluate fine again. It had some pieces not up to date: 
fileSystems definition, kernel version, ...


svn path=/nixos/trunk/; revision=34237
 2012-05-25 07:52:12 +00:00
Eelco Dolstra a3e04ba0aa * Fix problems with repeated installations due to the immutable bit 
(http://hydra.nixos.org/build/2645533).

svn path=/nixos/trunk/; revision=34235
 2012-05-25 02:30:52 +00:00
Eelco Dolstra b11770373a * Work properly if /root/.nix-defexpr/channels already exists. 
svn path=/nixos/trunk/; revision=34233
 2012-05-24 23:37:06 +00:00
Eelco Dolstra a6892051ef * Allow building with boot.loader.grub.enable set to "false". 
svn path=/nixos/trunk/; revision=34218
 2012-05-23 15:52:29 +00:00
Eelco Dolstra 9dadfc3541 * Mark QEMU VMs as NixOS machines. 
svn path=/nixos/trunk/; revision=34217
 2012-05-23 15:40:31 +00:00
Rob Vermaas 53af6f5668 Execute mount-all task on config-changed event to make sure it is performed before other upstart jobs are started on activating the new configuration. 
svn path=/nixos/trunk/; revision=34201
 2012-05-21 21:26:45 +00:00
Mathijs Kwik be69799f35 better workaround for building nested child configurations 
svn path=/nixos/trunk/; revision=34164
 2012-05-18 06:17:08 +00:00
Mathijs Kwik 7fca5408f3 Revert "Provided a workaround for grub's missing-devices check, so nested child configurations can still build." 
This reverts commit a89e8831e3d95bcf3ddc19ee34b938db7e8aa572.

svn path=/nixos/trunk/; revision=34163
 2012-05-18 06:17:05 +00:00
Eelco Dolstra 2577a17468 * Add /etc/os-release to be Lennart Poettering compliant. 
See http://0pointer.de/blog/projects/os-release.html

svn path=/nixos/trunk/; revision=34162
 2012-05-17 21:10:42 +00:00
Eelco Dolstra 801cd7402c * Don't use ‘chown user.group’ since that syntax is not officially 
supported (you're supposed to say ‘chown user:group’).

svn path=/nixos/trunk/; revision=34161
 2012-05-17 19:43:32 +00:00
Eelco Dolstra f889ebc488 * Allow runtime changes to boot.devShmSize and friends. 
svn path=/nixos/trunk/; revision=34160
 2012-05-17 19:33:55 +00:00
Eelco Dolstra e9e6885d3b * Lower the limits on /run and /dev. 
svn path=/nixos/trunk/; revision=34159
 2012-05-17 19:33:12 +00:00
Eelco Dolstra 91acb81b11 * Support globbing in the source attribute of environment.etc entries. 
svn path=/nixos/trunk/; revision=34158
 2012-05-17 18:43:45 +00:00
Eelco Dolstra c10b41ad99 * Make the fail2ban module configurable. 
svn path=/nixos/trunk/; revision=34157
 2012-05-17 18:19:48 +00:00
Mathijs Kwik 88b3c4b82e Provided a workaround for grub's missing-devices check, so nested child configurations can still build. 
svn path=/nixos/trunk/; revision=34153
 2012-05-17 10:17:32 +00:00
Eelco Dolstra 3ce8859551 * Basic module for fail2ban. Not configurable yet. It currently 
blocks IP addresses if they make too many failed login attempts.

svn path=/nixos/trunk/; revision=34149
 2012-05-17 02:51:24 +00:00
Eelco Dolstra a9a507eede * On headless systems, disable the emergency shell and redirect 
mountall output to the standard Upstart job log file
  (/var/log/upstart/mountall).

svn path=/nixos/trunk/; revision=34138
 2012-05-16 15:08:44 +00:00
Eelco Dolstra 6a6eec0f53 * Add a filesystem option ‘autoFormat’ to automatically do a format if 
the device has no filesystem yet.  Useful in Charon deployments.
  The check for an uninitialised filesystem is kind of shaky now.

svn path=/nixos/trunk/; revision=34133
 2012-05-16 00:03:44 +00:00
Eelco Dolstra 07fcf5baee * Make the boot.initrd.luks.enable option obsolete. It's enough to 
see that boot.initrd.luks.devices is non-empty.

svn path=/nixos/trunk/; revision=34120
 2012-05-15 20:45:01 +00:00
Eelco Dolstra dbf5e3229e * Remove Nix's dependencies from the chroot. Nix 1.0 doesn't need 
this anymore.

svn path=/nixos/trunk/; revision=34113
 2012-05-15 16:12:22 +00:00
Eelco Dolstra 560262dae0 * Fix "error: the group nixbld' specified in build-users-group' does 
not exist" during nixos-install.

svn path=/nixos/trunk/; revision=34103
 2012-05-15 13:50:36 +00:00
Eelco Dolstra ea3cfc9287 * Add xdg-open to the default X11 configuration so that programs like 
Chrome can open downloaded files.

svn path=/nixos/trunk/; revision=34097
 2012-05-15 02:49:47 +00:00
Eelco Dolstra 3b314fa40b * Include cryptsetup in EC2 AMIs. 
svn path=/nixos/trunk/; revision=34096
 2012-05-14 23:43:38 +00:00
Eelco Dolstra 29b05fb62a * nixos-checkout: add an argument to specify the directory where the 
sources should be stored.  E.g. "nixos-checkout /home/eelco/srcs"
  will check out to /home/eelco/srcs/{nixos,nixpkgs}.  Probably the
  /etc/nixos default should be removed eventually because /etc is a
  pretty weird place to keep large source trees.

svn path=/nixos/trunk/; revision=34086
 2012-05-14 04:12:43 +00:00
Eelco Dolstra 8d568e5a71 * nixos-option: clean up the English and the generated file. 
svn path=/nixos/trunk/; revision=34082
 2012-05-14 01:56:42 +00:00
Eelco Dolstra 3dd0718939 * Give an error at evaluation time if boot.loader.grub.device or 
boot.loader.grub.devices are not set, rather than complaining about
  it when it's too late.

svn path=/nixos/trunk/; revision=34081
 2012-05-14 01:53:47 +00:00
Eelco Dolstra 67d5f2b444 * Require fileSystems to be set. 
svn path=/nixos/trunk/; revision=34080
 2012-05-14 01:33:11 +00:00
Eelco Dolstra ce3941d6e6 * Move logFormat to the per-vhost options. 
svn path=/nixos/trunk/; revision=34066
 2012-05-11 23:14:05 +00:00
Eelco Dolstra 5167f5abef * Remove a bad definition of environment.etc. 
svn path=/nixos/trunk/; revision=34065
 2012-05-11 23:08:37 +00:00
Eelco Dolstra c4aa833e56 * Use optionSet to check environment.etc. 
svn path=/nixos/trunk/; revision=34064
 2012-05-11 23:06:35 +00:00
Rickard Nilsson 35f9502a27 Added option for specifying the path to the private key file sshd should use. 
svn path=/nixos/trunk/; revision=34039
 2012-05-09 22:13:53 +00:00
Rickard Nilsson 658ea20e7f Added option for specifying system-wide known hosts file for OpenSSH. 
svn path=/nixos/trunk/; revision=34038
 2012-05-09 22:11:07 +00:00
Rickard Nilsson 2df81f42a5 Moved idmapd configuration file to Nix store. 
svn path=/nixos/trunk/; revision=34037
 2012-05-09 22:06:17 +00:00
Eelco Dolstra e4200d7e61 * Some more trivial builders with lots of dependencies that should be 
built locally.

svn path=/nixos/trunk/; revision=34034
 2012-05-09 21:35:47 +00:00
Peter Simons 7a69733704 Added 'networking.dhcpcd.denyInterfaces' to extend the list of network 
interfaces black-listed for dhcpcd via configuration.nix. I use this option to
disable DHCP for "veth*" interfaces, which are created by LXC for use inside of
virtual machines.

svn path=/nixos/trunk/; revision=34018
 2012-05-08 11:46:01 +00:00
Shea Levy 1a0c9ce201 The efibootmgr bricking problem was fixed in 2.6.39 
svn path=/nixos/trunk/; revision=33990
 2012-05-05 15:43:28 +00:00
Shea Levy c716747cce Need a slighty bigger boot image to contain the efi shell 
svn path=/nixos/trunk/; revision=33986
 2012-05-05 14:23:51 +00:00
Shea Levy 3aae8bfa61 Switch to using efi shell + startup.nsh as the 
removable media efi boot option.

svn path=/nixos/trunk/; revision=33984
 2012-05-04 22:16:35 +00:00
Sander van der Burg 4b650026bf The <> syntax has to be applied properly, in order to find build-vms.nix 
svn path=/nixos/trunk/; revision=33981
 2012-05-03 12:31:01 +00:00
Eelco Dolstra b603babd0f * Use PostgreSQL's fast shutdown mode. In the default 
smart shutdown mode, Postgres waits until all 
  active connections have closed, which can take an
  unbounded amount of time.

svn path=/nixos/trunk/; revision=33959
 2012-04-30 18:15:32 +00:00
Eelco Dolstra be189991e0 * Revert r33928: veth* can also be a bridged interface requiring dhcp. 
See e.g. https://nixos.org/repos/nix/configurations/trunk/tud/stan.nix

  So we need a better solution for this...

svn path=/nixos/trunk/; revision=33957
 2012-04-30 17:46:11 +00:00
Eelco Dolstra 03f2847054 * Set preferLocalBuild on a few trivial top-level derivations. These 
tend to cause a lot of unnecessary I/O to the build machines.

svn path=/nixos/trunk/; revision=33936
 2012-04-26 15:19:23 +00:00
Eelco Dolstra 836fa3b6ae * Fix missing semicolon. 
svn path=/nixos/trunk/; revision=33933
 2012-04-26 14:53:58 +00:00
Eelco Dolstra 4d07f159a1 * Create /nix/var/nix/profiles/per-user with the right permissions. 
Fixes NixOS/149.

svn path=/nixos/trunk/; revision=33929
 2012-04-26 13:16:58 +00:00
Peter Simons 8b841505ff modules/services/networking/{dhclient,dhcpcd}.nix: ignore virtual veth* devices created by LXC/cgroups 
svn path=/nixos/trunk/; revision=33928
 2012-04-26 12:31:33 +00:00
Peter Simons 8c93993e1b modules/system/boot/luksroot.nix: fixed the descriptions of the options defined in this module 
svn path=/nixos/trunk/; revision=33927
 2012-04-26 12:21:45 +00:00
Peter Simons 86ba0c52b3 modules/services/networking/ssh/sshd.nix: stripped trailing whitespace 
svn path=/nixos/trunk/; revision=33926
 2012-04-26 08:13:24 +00:00
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
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 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 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 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
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 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 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
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
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
Eelco Dolstra 096b7723c8 * Add a command "nixos-version" that prints the version of the 
currently activated NixOS.  This is "0.1pre-svn" when built from a
  SVN tree, but contains the actual revision when installed from the
  NixOS channel or from the ISO.

svn path=/nixos/trunk/; revision=33730
 2012-04-10 20:56:38 +00:00
Eelco Dolstra f9ac67c67f * Copying manifests is slightly tricky because 
download-using-manifests expects that the files in
  /nix/var/nix/manifests are symlinks into the store.

svn path=/nixos/trunk/; revision=33727
 2012-04-10 15:36:50 +00:00
Eelco Dolstra f37b453b19 * nixos-install: Ensure that builds are done by the nixbld users 
rather than root.  Also copy all manifests into the chroot so that
  any nix-pull done outside the chroot is "inherited".

svn path=/nixos/trunk/; revision=33725
 2012-04-10 14:39:12 +00:00
Eelco Dolstra f9e8e735bb * Remove debug line. 
svn path=/nixos/trunk/; revision=33723
 2012-04-10 13:28:48 +00:00
Eelco Dolstra 5c06c66b68 * Clear more locale-related variables in the installer. 
svn path=/nixos/trunk/; revision=33722
 2012-04-10 13:28:17 +00:00
Eelco Dolstra b2025c4687 * Use "umount -l" to clean up. 
svn path=/nixos/trunk/; revision=33721
 2012-04-10 13:25:55 +00:00
Eelco Dolstra 5409e76353 * Disable wicd in the installation CD for now, because it causes 
dhcpcd to segfault randomly or give corrupt output.  See e.g.

    http://hydra.nixos.org/build/2380666/nixlog/1/raw

  The problem seems to be that wicd sends a "-k" command to dhcpcd to
  release the interface, which doesn't work well with a dhcpcd that
  handles all interfaces in one process.

svn path=/nixos/trunk/; revision=33720
 2012-04-10 13:09:56 +00:00
Eelco Dolstra a7af5588b6 * Drop ugly reference to var/run/current-system/sw/sbin/wpa_cli, and 
make it conditional.

svn path=/nixos/trunk/; revision=33717
 2012-04-10 12:07:30 +00:00
Eelco Dolstra 83679c99b1 * Don't put /var and /nix on ephemeral storage if we're booting 
from EBS.

svn path=/nixos/trunk/; revision=33716
 2012-04-10 11:11:05 +00:00
Lluís Batlle i Rossell 849d136aa6 Making also the system-tarball-pc show the memtest entry as the 
pkgs.memtest86.name.


svn path=/nixos/trunk/; revision=33693
 2012-04-09 20:37:54 +00:00
Lluís Batlle i Rossell 9017ccf9fe Removing the special memtest.nix module for the isos, and using 
the same as the usual nixos. I think this trivial change works;
I checked the grub.cfg output generated in the iso_minimal.


svn path=/nixos/trunk/; revision=33692
 2012-04-09 20:36:26 +00:00
Lluís Batlle i Rossell 6e281e46b7 I update the name of the memtest entry in grub of the iso images, 
because it can be overriden choosing another memtest86.

As an effect of a change in nixpgks, the isos will include
memtest86 4.0a instead of memtest86+ 4.20, only because the 
former is released later, and I deduce it should work better.


svn path=/nixos/trunk/; revision=33691
 2012-04-09 20:30:14 +00:00
Lluís Batlle i Rossell 0b8b6616b6 Making the memtest name come from the pkgs.memtest86, as the nixos 
user can override choosing between two memtests.


svn path=/nixos/trunk/; revision=33690
 2012-04-09 20:08:14 +00:00
Rob Vermaas 6b34bd8564 remove remaining reference to nixos-deploy-nwtork 
svn path=/nixos/trunk/; revision=33663
 2012-04-07 15:18:39 +00:00
Eelco Dolstra 301c4d96b1 * Remove nixos-deploy-network. It has been superceded by Charon. 
svn path=/nixos/trunk/; revision=33662
 2012-04-07 13:26:35 +00:00
Eelco Dolstra 6e7859814c * Move misc/deployment.nix to Charon, since these options don't really 
make sense outside of a Charon deployment.

svn path=/nixos/trunk/; revision=33661
 2012-04-07 13:17:03 +00:00
Peter Simons ec3dca188c Dropped the unused/unknown/obsolete module i8042 from 'boot.initrd.kernelModules'. 
svn path=/nixos/trunk/; revision=33654
 2012-04-06 19:21:50 +00:00
Eelco Dolstra 4f4c529979 Stage 1 improvements: 
* Load scsi_wait_scan after all other kernel modules to ensure that
  all SCSI device nodes have been created.
* Increase the timeout for the appearance of the root device to 20
  seconds.
* Do a "udevadm settle" just after the root device has appeared to
  make sure that udev isn't accessing the device anymore (hopefully).
  On EC2 (Xen), I've seen fsck on the root fail randomly with "device
  in use" errors.

svn path=/nixos/trunk/; revision=33650
 2012-04-06 14:20:43 +00:00
Eelco Dolstra 1e8e83408b * Revert unintended commit. 
svn path=/nixos/trunk/; revision=33646
 2012-04-06 12:23:44 +00:00
Eelco Dolstra 852e513638 * Handle booting from /dev/xvda. 
svn path=/nixos/trunk/; revision=33645
 2012-04-06 12:23:12 +00:00
Eelco Dolstra e44b87dd31 * Pass --no-sessions to Upstart to make sure users cannot start 
Upstart jobs (even when Upstart has attached to D-Bus).

svn path=/nixos/trunk/; revision=33617
 2012-04-05 12:27:21 +00:00
Mathijs Kwik 9a91181be9 damn you shell syntax! :) 
svn path=/nixos/trunk/; revision=33603
 2012-04-05 08:20:43 +00:00
Lluís Batlle i Rossell 56d9e60bb7 Making bind start on started network-interfaces. It wasn't starting ever. 
svn path=/nixos/trunk/; revision=33542
 2012-04-02 18:28:42 +00:00
Lluís Batlle i Rossell fbd4f65652 Fixing the comment on the new grub/memtest.nix module. 
svn path=/nixos/trunk/; revision=33540
 2012-04-02 17:31:08 +00:00
Lluís Batlle i Rossell 9a6f2231b2 Adding a module for memtest86+, so if enabled, will appear in the grub menu. 
To enable it:
boot.loader.grub.memtest86 = true;


svn path=/nixos/trunk/; revision=33539
 2012-04-02 17:19:21 +00:00
Mathijs Kwik a1e86494d0 made challenge-response authentication method configurable for openssh 
challenge-response is an authentication method that does not need the
plain text password to be emitted over the (encrypted) connection.
This is nice if you don't fully trust the server.

It is enabled (upstream) by default.

To the end user, it still looks like normal password authentication,
but instead of sending it, it is used to hash some challenge.

This means that if you don't want passwords to be used ever at all,
and just stick to public key authentication, you probably want to
disable this option too.

svn path=/nixos/trunk/; revision=33513
 2012-04-01 10:54:17 +00:00
Mathijs Kwik e216ce07df dhcpcd: ip-up and ip-down emit more info (like wifi access point) 
useful to only start certain services (like vpn) on certain networks

svn path=/nixos/trunk/; revision=33512
 2012-04-01 10:54:15 +00:00
Mathijs Kwik 7d4fd69b5f dhcpcd: wifi disconnect should also generate ip-down 
svn path=/nixos/trunk/; revision=33511
 2012-04-01 10:54:13 +00:00
Mathijs Kwik 7ba690add6 optionally allow normal users to control wpa_supplicant through 
wpa_gui or wpa_cli.

Comes with a default wpa_supplicant.conf, which gets updated through
aforementioned utilities.

svn path=/nixos/trunk/; revision=33510
 2012-04-01 10:54:10 +00:00
Mathijs Kwik 7f84957ff2 mongodb: allow running as a replicaset member 
also useful for point-in time backups using mongodump --oplog

svn path=/nixos/trunk/; revision=33509
 2012-04-01 10:54:08 +00:00
Mathijs Kwik de5b437004 assertions '.msg' doesn't exist => .message 
svn path=/nixos/trunk/; revision=33508
 2012-04-01 10:54:06 +00:00
Joachim Schiele bc6ca7944f fixed a upstart issue where upsd was never started 
svn path=/nixos/trunk/; revision=33494
 2012-03-31 11:39:30 +00:00
Lluís Batlle i Rossell f4883572d8 Making the init interactive shells handle well console kernel parameters 
with extra parameters, like console=ttyS0,115200.


svn path=/nixos/trunk/; revision=33458
 2012-03-28 19:58:44 +00:00
Eelco Dolstra 1d3c7e2a2d * Added a ‘deployment.ec2.tags’ option. 
svn path=/nixos/trunk/; revision=33449
 2012-03-28 13:02:55 +00:00
Joachim Schiele f4d26eb446 added example for GRUB 2 
svn path=/nixos/trunk/; revision=33448
 2012-03-28 10:34:40 +00:00
Eelco Dolstra 040042b8a5 * Blackhole the address 169.254.169.254 after we've obtained the user 
data to prevent non-root processes from getting the private host
  key.

svn path=/nixos/trunk/; revision=33442
 2012-03-27 14:51:08 +00:00
Eelco Dolstra 64241a3e90 * Flush nscd when switching to a new configuration. 
svn path=/nixos/trunk/; revision=33441
 2012-03-27 14:35:45 +00:00
Eelco Dolstra da6046ef6b * Fix the generation of resolvconf.conf. 
svn path=/nixos/trunk/; revision=33435
 2012-03-26 22:14:47 +00:00
Lluís Batlle i Rossell e9d641014d Not everyone runs nscd. Fixing a boot problem for those who don't. 
svn path=/nixos/trunk/; revision=33434
 2012-03-26 21:01:46 +00:00
Mathijs Kwik f31fefdfd9 splitted ssh/sshd X11 forwarding logic. Backward compatible change. 
You can now set the forwardX11 config option for the ssh client and server separately.

For server, the option means "allow clients to request X11 forwarding".
For client, the option means "request X11 forwarding by default on all connections".

I don't think it made sense to couple them. I might not even run the server on some machines.
Also, I ssh to a lot of machines, and rarely want X11 forwarding. The times I want it,
I use the -X/-Y option, or set it in my ~/.ssh/config.

I also decoupled the 'XAuthLocation' logic from forwardX11.
For my case where ssh client doesn't want forwarding by default, it still wants to set the path for the cases I do need it.

As this flag is the one that pulls in X11 dependencies, I changed the minimal profile and the no-x-libs config to check that instead now.

svn path=/nixos/trunk/; revision=33407
 2012-03-25 15:42:05 +00:00
Lluís Batlle i Rossell 9fb07d4036 Making a reference single-quoted for grubDevices, as after substitution, there 
will be doublequoted elements.

Suggested by Kirelagin.


svn path=/nixos/trunk/; revision=33403
 2012-03-25 12:36:43 +00:00
Eelco Dolstra 70e1958bb6 * New 64-bit AMIs. 
svn path=/nixos/trunk/; revision=33390
 2012-03-23 21:22:58 +00:00
Eelco Dolstra 326891443c * dhcpcd: Don't use the "persistent" option. With it, dhcpcd won't 
delete routes and addresses when it quits.  This causes those routes
  and addresses to stick around forever, since dhcpcd won't delete
  them when it runs next (even if it acquires a new lease on the same
  interface).  This is bad; in particular the stale (default) routes
  can break networking.

  The downside to removing "persistent" is that you should never ever
  do "stop dhcpcd" on a remote machine configured by dhcpcd.

svn path=/nixos/trunk/; revision=33388
 2012-03-23 21:00:32 +00:00
Eelco Dolstra 3d87c27c6d svn path=/nixos/trunk/; revision=33383 2012-03-23 14:23:19 +00:00
Eelco Dolstra 43b5ced96c * Ignore SIGHUP and write errors on stderr to ensure that 
switch-to-configuration runs to completion (e.g. if the tty we're on
  got killed).

svn path=/nixos/trunk/; revision=33382
 2012-03-23 13:37:22 +00:00
Eelco Dolstra 1949a85987 * Do a sync before switching to a new configuration. 
svn path=/nixos/trunk/; revision=33381
 2012-03-23 12:29:11 +00:00
Eelco Dolstra 7c75b046ea * Fix the permissions on /dev/vboxuser in VirtualBox guests. 
svn path=/nixos/trunk/; revision=33372
 2012-03-23 11:52:06 +00:00
Eelco Dolstra b46e911012 * Fix some references to dhclient. 
svn path=/nixos/trunk/; revision=33359
 2012-03-22 13:02:42 +00:00
Eelco Dolstra 4ae7819c39 * The idmapd job requires the sunrpc kernel module to be loaded. 
(http://hydra.nixos.org/build/2315397)

svn path=/nixos/trunk/; revision=33358
 2012-03-22 13:01:06 +00:00
Rob Vermaas a525074f43 increase size of virtualbox image 
svn path=/nixos/trunk/; revision=33357
 2012-03-22 12:58:45 +00:00
Eelco Dolstra 2a135eb4d4 * Remove the ‘services.nfs.client.enable’ flag; use 
‘boot.supportedFilesystems = [ "nfs" ]’ if needed.

svn path=/nixos/trunk/; revision=33356
 2012-03-22 12:24:23 +00:00
Eelco Dolstra 293e3a784d * Ensure a consitent umask in the activation script (reported by 
Lluís).

svn path=/nixos/trunk/; revision=33347
 2012-03-22 10:17:10 +00:00
Eelco Dolstra 89a21f7a7d * GIDs are supposed to match UIDs. 
svn path=/nixos/trunk/; revision=33346
 2012-03-22 10:11:15 +00:00
Lluís Batlle i Rossell 5ddae4a83a Changing portmap by rpcbind on nfs services. 
That could make rpc.statd work.

Patch by Rickard Nilsson.

I'm not sure we need that netconfig file in etc.


svn path=/nixos/trunk/; revision=33342
 2012-03-21 20:37:37 +00:00
Eelco Dolstra a4a355f764 * Make dhcpcd the default DHCP client. 
svn path=/nixos/trunk/; revision=33339
 2012-03-21 17:49:54 +00:00
Eelco Dolstra d12339b282 * Doh. 
svn path=/nixos/trunk/; revision=33332
 2012-03-21 12:38:11 +00:00
Eelco Dolstra 8884d445b7 * VirtualBox: create a vboxnet0 interface by default. 
svn path=/nixos/trunk/; revision=33331
 2012-03-21 12:28:14 +00:00
Lluís Batlle i Rossell 20edb255bd Adding idmapd, for NFSv4. 
Patch by Rickard Nilsson.

This may fix rpc.statd start.


svn path=/nixos/trunk/; revision=33330
 2012-03-21 11:58:06 +00:00
Shea Levy 7a9a33e90d efi-boot-stub: Give startup.sh files more descriptive names 
svn path=/nixos/trunk/; revision=33321
 2012-03-21 02:05:52 +00:00
Eelco Dolstra 6f03065dce * Move the setting of $MODULE_DIR to modprobe.nix. 
* Add a slash to the end of $MODULE_DIR, as expected by depmod.  (Not
  that running depmod from the command line is all that useful, since
  you can't use it to update the tree in the Nix store.  But at least
  commands like "depmod -n" work now.)  Reported by Kirill Elagin on
  IRC.

svn path=/nixos/trunk/; revision=33312
 2012-03-20 22:02:27 +00:00
Lluís Batlle i Rossell 6af26254ad Adding xfs support at supportedFilesystems 
svn path=/nixos/trunk/; revision=33311
 2012-03-20 22:00:32 +00:00
Eelco Dolstra e86427f037 * Remove an obsolete line. 
svn path=/nixos/trunk/; revision=33308
 2012-03-20 21:43:13 +00:00
Shea Levy 70eb64c025 Pommed: find the 'eject' command in /var/setuid-wrappers:/home/shlevy/.nix-profile/bin:/home/shlevy/.nix-profile/sbin:/home/shlevy/.nix-profile/lib/kde4/libexec:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/nix/var/nix/profiles/default/lib/kde4/libexec:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin:/var/run/current-system/sw/lib/kde4/libexec 
svn path=/nixos/trunk/; revision=33302
 2012-03-20 18:28:32 +00:00
Eelco Dolstra 010578d8a4 * Restrict VirtualBox to users in the vboxusers group. 
The VirtualBox build in Nixpkgs is insecure because it uses the
  "--disable-hardened" flag, which disables some checks in the
  VirtualBox kernel module.  Since getting rid of that flag looks like
  too much work, it's better to ensure that only explicitly permitted
  users have access to VirtualBox.

* Drop the 666 permission on "sonypi" because it's not clear why that
  device should be world-writable.

svn path=/nixos/trunk/; revision=33301
 2012-03-20 16:30:43 +00:00
Shea Levy 11066067f7 Add nouveau xorg video driver 
svn path=/nixos/trunk/; revision=33300
 2012-03-20 16:29:22 +00:00
Eelco Dolstra d9e28560d1 * Emit "expect daemon" for the mountall task. Otherwise it may get a 
USR1 signal before it has forked into the background (because it
  will be in the start/running state immediately).

svn path=/nixos/trunk/; revision=33288
 2012-03-20 10:17:08 +00:00
Shea Levy 0d67d95f32 Add a module for the pommed tool for Apple laptop keyboards. 
svn path=/nixos/trunk/; revision=33286
 2012-03-20 04:41:13 +00:00
Shea Levy 6435207dd1 Whoops, actually use the mtrack fork 
svn path=/nixos/trunk/; revision=33285
 2012-03-20 01:56:39 +00:00
Shea Levy 724b5abe42 xf86-input-multitouch seems to be abandoned, update it with the mtrack fork 
svn path=/nixos/trunk/; revision=33283
 2012-03-20 01:48:09 +00:00
Shea Levy 14dd95b692 xserver.nix: Automatically support xorg's own video drivers 
svn path=/nixos/trunk/; revision=33281
 2012-03-19 23:57:26 +00:00
Eelco Dolstra 6093b54b73 * Zabbix: use the path attribute. 
svn path=/nixos/trunk/; revision=33278
 2012-03-19 19:43:31 +00:00
Eelco Dolstra a51a83bd8c * Drop obsolete line. 
svn path=/nixos/trunk/; revision=33276
 2012-03-19 19:34:06 +00:00
Eelco Dolstra 533448ae37 * udev: don't set the STARTUP flag anymore, since LVM no longer uses 
it.
* Don't call "vgscan" anymore; VG scans are supposed to be automatic.

svn path=/nixos/trunk/; revision=33275
 2012-03-19 19:10:27 +00:00
Lluís Batlle i Rossell 81655b7247 Have a more featured initrd and crashDump for the pc system tarball. 
svn path=/nixos/trunk/; revision=33274
 2012-03-19 19:01:52 +00:00
Eelco Dolstra f546837cdf * Don't use replaceChars. It's slow. 
svn path=/nixos/trunk/; revision=33270
 2012-03-19 18:07:28 +00:00
Eelco Dolstra fcc2e985a2 * Handle jobs that fail while a post-start script is waiting for them. 
svn path=/nixos/trunk/; revision=33269
 2012-03-19 18:07:05 +00:00
Eelco Dolstra 31c93522d5 * Support PostgreSQL versions >= 8.4, which have a slightly different 
pg_hba.conf format.

svn path=/nixos/trunk/; revision=33268
 2012-03-19 18:06:18 +00:00
Shea Levy fac0fef5d8 Whoops 
svn path=/nixos/trunk/; revision=33264
 2012-03-19 17:25:50 +00:00
Shea Levy 842239f5af all-hardware.nix: Apple users may want to be able to type something at a debug2 prompt 
svn path=/nixos/trunk/; revision=33263
 2012-03-19 17:23:24 +00:00
Eelco Dolstra f12950b8e0 * Improve the Postgres Upstart job: don't use pg_ctl, let Upstart 
monitor the postgres process directly (so that it can be restarted
  if necessary), let Upstart send SIGTERM to postgres to shut it down
  gracefully.  Also drop the Mediawiki references.

svn path=/nixos/trunk/; revision=33262
 2012-03-19 16:49:13 +00:00
Eelco Dolstra ebc6d7f435 * Attempt to fix the random "udevadm settle - timeout of 120 seconds 
reached, the event queue contains: /sys/devices/virtual/tty/hvc1" VM
  failures.

svn path=/nixos/trunk/; revision=33259
 2012-03-19 15:10:39 +00:00
Eelco Dolstra dde8453a09 * Initialise $LOCALE_ARCHIVE earlier in /etc/profile to prevent the 
warning

    -bash: warning: setlocale: LC_TIME: cannot change locale (en_GB.UTF8): No such file or directory

  when $LC_TIME is set in environment.shellInit.

svn path=/nixos/trunk/; revision=33248
 2012-03-19 02:53:58 +00:00
Eelco Dolstra bcbe2dce4c * Don't source /etc/profile in interactive non-login shells, unless it 
wasn't sourced in a parent shell (as determined by the environment
  variable __ETC_PROFILE_DONE).  This prevents overriden values of
  environment variables such as $PATH from being clobbered in
  subshells.
* Move all aliases to /etc/bashrc (since those are for interactive
  use).

svn path=/nixos/trunk/; revision=33246
 2012-03-19 02:35:17 +00:00
Eelco Dolstra b1fd71038e * Slight speedup. It's amazing how quickly shell scripts become 
slow: calling basename in a loop somewhere has a noticable impact on
  performance.  We really shouldn't use bash scripts.

svn path=/nixos/trunk/; revision=33242
 2012-03-18 19:05:44 +00:00
Shea Levy 53580d514a You cant modprobe efivars from within the chroot, so modprobe efivars when booting an efi-compatible install CD 
svn path=/nixos/trunk/; revision=33241
 2012-03-18 18:55:47 +00:00
Eelco Dolstra 8ca2aff772 * Get rid of some grep hackery on the Upstart jobs. 
svn path=/nixos/trunk/; revision=33240
 2012-03-18 18:53:50 +00:00
Eelco Dolstra 9ba5f09e44 * More tasks that shouldn't be restarted (though they're harmless). 
svn path=/nixos/trunk/; revision=33238
 2012-03-18 18:09:17 +00:00
Eelco Dolstra 4acc48fc2d * Mark tasks such as mount-failed as not to be restarted. 
svn path=/nixos/trunk/; revision=33237
 2012-03-18 18:04:49 +00:00
Eelco Dolstra 362d1389d3 * mountall: make the "console output" Upstart stanza do its work. We 
were redirecting output to /var/log/upstart/<job>, so it didn't work
  properly.
* mountall-ip-up: send the USR1 signal to the mountall process by
  looking up its PID, rather than doing "pkill -USR1 mountall".  This
  prevents a very subtle race condition where USR1 is delivered to a
  child process of mountall (such as fsck), if pkill sees the child
  just before its execve().  There is actually still a race condition
  because mountall installs its USR1 handler *after* daemonising, so
  mountall-ip-up could accidentally kill mountall.  Should report this
  to upstream.

svn path=/nixos/trunk/; revision=33236
 2012-03-18 17:48:19 +00:00
Shea Levy b82c253b24 Add a kernel patch for the efi boot stub to read a config file when booted without arguments, and base removable media booting off of that patch 
The patch is currently being discussed on LKML and hopefully will be included
in mainline in some form in the future. Note that booting from the livecd has
to do a lot of work before anything is output to the console, so if the drive
is still busy don't assume the boot has hanged

svn path=/nixos/trunk/; revision=33235
 2012-03-18 17:14:52 +00:00
Eelco Dolstra 2cc8d0363e * Move the implementation of boot.kernelModules to udev's postStart. 
It needs udevd to be running because the modules may require
  firmware.  Thanks to Mathijs and Arie for pointing this out.

svn path=/nixos/trunk/; revision=33234
 2012-03-18 14:03:42 +00:00
Lluís Batlle i Rossell b78ac9e108 Fixing the mkOverride for the kernelPackages in crashdump (I misunderstood 
mkOverride in the prev commit).

Adding an option on kernelParams for the postcrash kernel.


svn path=/nixos/trunk/; revision=33230
 2012-03-18 10:02:58 +00:00
Mathijs Kwik c5a8d53d95 fixed intel microcode loading during boot 
svn path=/nixos/trunk/; revision=33226
 2012-03-18 08:10:32 +00:00
Eelco Dolstra 21393eed1e * Use the --quiet flag. 
svn path=/nixos/trunk/; revision=33225
 2012-03-18 02:36:44 +00:00
Eelco Dolstra 83f5d26a85 * Ignore the "No soundcards found" error. 
svn path=/nixos/trunk/; revision=33224
 2012-03-18 02:36:21 +00:00
Eelco Dolstra 86d8d62d16 * Allow Upstart jobs to declare that they shouldn't be restarted by 
switch-to-configuration.  E.g. the X server shouldn't be restarted
  because that kills all the X clients.

svn path=/nixos/trunk/; revision=33223
 2012-03-18 02:10:39 +00:00
Eelco Dolstra 3495a773f9 * Improved Upstart job handling in switch-to-configuration. It no 
longer compares the current configuration to the previous
  configuration, but instead compares the current Upstart state to the
  intended state.  Thus, if the switch script is interrupted, running
  nixos-rebuild again will resume starting/stopping Upstart jobs where
  the previous run left off.

  We determine if an Upstart job has changed by having the pre-start
  script of each Upstart job put a symlink to its .conf file in
  /var/run/upstart-jobs.  So if this symlink differs from the target
  of /etc/init/<job>.conf, then the job has changed.  This also
  prevents multiple restarts of dependent jobs.  E.g., if job B has
  "start on started A" and "stop on stopping A", then restarting A
  will cause B to be restarted, so B shouldn't B restarted a second
  time.

  We only start jobs that are not running if 1) they're tasks that
  have been previously run (like mountall); or 2) they're jobs that
  have a "start on" condition.  This seems a reasonable heuristic.

svn path=/nixos/trunk/; revision=33222
 2012-03-18 01:53:35 +00:00
Eelco Dolstra 5a98d6d514 * mountall: Don't start the emergency shell if the X server is 
running.  The user won't see it, and the "console owner" stanza
  breaks VT switching and causes the X server to go to 100% CPU time.

svn path=/nixos/trunk/; revision=33221
 2012-03-18 01:44:20 +00:00
Lluís Batlle i Rossell 876c655e61 Adding a module to get crash dumps using kexec. 
svn path=/nixos/trunk/; revision=33219
 2012-03-17 22:21:37 +00:00
Eelco Dolstra ed436179e1 * Improve some job names. 
svn path=/nixos/trunk/; revision=33215
 2012-03-17 19:22:22 +00:00
Eelco Dolstra ee6c9bb998 * Provide two utility functions in Upstart jobs: "ensure JOBNAME" 
starts the given job and waits until it's running; "stop_check"
  checks that the current job hasn't been asked to stop.

svn path=/nixos/trunk/; revision=33214
 2012-03-17 19:12:33 +00:00
Eelco Dolstra 07df536c42 * Fix comment. 
svn path=/nixos/trunk/; revision=33213
 2012-03-17 18:01:42 +00:00
Eelco Dolstra 53847ef665 * Don't use the non-existent "never" condition in stopOn. 
svn path=/nixos/trunk/; revision=33212
 2012-03-17 18:00:20 +00:00
Eelco Dolstra dd693fdc5e * Revert unintended commit. 
svn path=/nixos/trunk/; revision=33209
 2012-03-17 17:31:08 +00:00
Eelco Dolstra 573877c1ac * Use boot.kernelModules everywhere instead of explicit calls to 
modprobe.
* Move the implementation of boot.kernelModules from the udev job to
  the activation script.  This prevents races with the udev job.
* Drop references to the "capability" kernel module, which no longer
  exists.

svn path=/nixos/trunk/; revision=33208
 2012-03-17 17:26:17 +00:00
Eelco Dolstra 646d67465c * Upstart stupidly doesn't kill post-start scripts if we do "stop 
JOB", but it does kill the job's main process.  So if the post-start
  script if waiting for the job's main process to reach some state, it
  may hang forever.  Thus, the post-start script should monitor
  whether its job has been requested to stop and exit in that case.

svn path=/nixos/trunk/; revision=33176
 2012-03-16 21:24:51 +00:00
Eelco Dolstra 67a90c6d6f * Renamed services.nfsKernel to services.nfs. Unfortunately 
rename.nix doesn't allow renaming sets of options...
* Renamed nfs-kernel.nix to nfsd.nix
* Move NFS client stuff from nfsd.nix to filesystems/nfs.nix.

svn path=/nixos/trunk/; revision=33174
 2012-03-16 20:41:49 +00:00
Eelco Dolstra e963fe2b2c * Forgot to commit. 
svn path=/nixos/trunk/; revision=33173
 2012-03-16 20:23:45 +00:00
Eelco Dolstra a395e46192 * Fix the NFS Upstart dependencies. Mountd is now started before 
nfsd, as suggested by the nfs-utils README.

  Also, rather than relying on Upstart events (which have all sorts of
  problems, especially if you have jobs that have multiple
  dependencies), we know just let jobs start their on prerequisites.
  That is, nfsd starts mountd in its preStart script; mountd starts
  statd; statd starts portmap.  Likewise, mountall starts statd to
  ensure that it can mount NFS filesystems.  This means that doing
  something like "start nfsd" from the command line will Do The Right
  Thing and start the dependencies of nfsd.

svn path=/nixos/trunk/; revision=33172
 2012-03-16 20:10:14 +00:00
Eelco Dolstra 823471a100 * portmap: add a postStart action that ensures that portmap is 
actually listening.  Otherwise we have a race condition during boot
  where statd's start can be delayed, causing NFSv3 mounting to fail.

svn path=/nixos/trunk/; revision=33171
 2012-03-16 19:49:47 +00:00
Eelco Dolstra 5a36c25e9f * nfsd and statd do not need to be stopped when portmap stops. 
svn path=/nixos/trunk/; revision=33167
 2012-03-16 17:43:18 +00:00
Shea Levy 097c656361 iso-image: Make efi-bootable cds actually bootable. 
The image passed to genisofs needs to be a FAT image with the right filesystem
layout, not an EFI executable image

svn path=/nixos/trunk/; revision=33162
 2012-03-16 16:45:40 +00:00
Eelco Dolstra c5ca681c06 * Drop the unnecessary "nfs-kernel-" prefix from the job names. 
svn path=/nixos/trunk/; revision=33159
 2012-03-16 13:56:51 +00:00
Shea Levy 4716ccf1b1 nixosBootStub: Hide noisy efibootmgr output 
svn path=/nixos/trunk/; revision=33157
 2012-03-16 13:40:03 +00:00
Eelco Dolstra 0c1ec805fc * In fact get rid of the whole nfs-kernel-exports job. 
svn path=/nixos/trunk/; revision=33156
 2012-03-16 13:40:02 +00:00
Eelco Dolstra d2b3c2cda4 * Start fixing the NFS mess. It was completely broken because the 
exportfs job didn't work at all (so /var/lib/nfs/etab didn't get
  initialised).

svn path=/nixos/trunk/; revision=33153
 2012-03-16 13:00:27 +00:00
Shea Levy 8ad872ca03 Revert r33139 
I didn't end up needing it and there's a better way to do what I wanted if I
did.

svn path=/nixos/trunk/; revision=33150
 2012-03-16 12:01:08 +00:00
Shea Levy d9e28e909c Move NixosBootPkg into NixOS 
svn path=/nixos/trunk/; revision=33149
 2012-03-16 11:53:50 +00:00
Shea Levy c61d919941 Typographical conventions 
svn path=/nixos/trunk/; revision=33148
 2012-03-16 11:31:33 +00:00
Shea Levy 358b699c20 installation-cd-efi: Only build a minimal cd 
svn path=/nixos/trunk/; revision=33147
 2012-03-16 11:25:09 +00:00
Shea Levy a315eefca1 Restore old installation-cd-new-kernel.nix and create a new installation-cd-efi.nix 
svn path=/nixos/trunk/; revision=33146
 2012-03-16 11:22:05 +00:00
Shea Levy 95bec1c001 efiBootStub: Properly handle the removableMediaImage path on different architectures 
svn path=/nixos/trunk/; revision=33141
 2012-03-16 06:08:55 +00:00
Shea Levy 8efda48496 Enable building an efi-bootable ISO 
svn path=/nixos/trunk/; revision=33140
 2012-03-16 05:37:24 +00:00