Commit graph

1924 commits

Author SHA1 Message Date
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
Shea Levy
b89a65e54c Allow multiple definitions of boot.loader.kernelFile as long as they are all the same
svn path=/nixos/trunk/; revision=33139
2012-03-16 03:20:12 +00:00
Shea Levy
1bccbc30cd efiBootStub: Assert that the
kernel has the efiBootStub feature

svn path=/nixos/trunk/; revision=33138
2012-03-16 02:55:17 +00:00
Shea Levy
4caf3560be efiBootStub: Add the installRemovableMediaImage option
svn path=/nixos/trunk/; revision=33135
2012-03-16 02:34:07 +00:00
Eelco Dolstra
f4903be57e * nixos-hardware-scan: detect if we're in a VirtualBox guest and
enable the guest additions in that case.

svn path=/nixos/trunk/; revision=33133
2012-03-16 01:57:23 +00:00
Eelco Dolstra
53bd25c7fa * Automatically start VBoxClient-all when the X session starts. This
allows seamless windows, resizing of the desktop, cut and paster,
  etc.

svn path=/nixos/trunk/; revision=33131
2012-03-16 01:29:51 +00:00
Eelco Dolstra
4adc99f9a5 * Enable the VirtualBox X11 display and mouse drivers.
svn path=/nixos/trunk/; revision=33130
2012-03-16 01:03:09 +00:00
Eelco Dolstra
3ddbe0f9fb * Drop references to activation scriptlets that no longer exist.
svn path=/nixos/trunk/; revision=33110
2012-03-15 14:21:17 +00:00
Eelco Dolstra
6b2dfbda00 * Make the mountall job depend on /etc/fstab so that it gets restarted
when fstab changes.

svn path=/nixos/trunk/; revision=33108
2012-03-15 13:54:23 +00:00
Yury G. Kudryashov
9bb1132525 NM: add IFACE to ip-up
svn path=/nixos/trunk/; revision=33107
2012-03-15 13:51:17 +00:00
Eelco Dolstra
1186167be2 * Fix xserver restart with cfg.driSupport32Bit. Contributed by Kirill
Elagin.

svn path=/nixos/trunk/; revision=33099
2012-03-15 10:26:08 +00:00
Yury G. Kudryashov
339d5b2b48 Add NetworkManager module
It works but it doesn't respect ignoredInterfaces etc.
Probably I forgotten to create some directories (all of them exist on my
laptop). Feel free to fix this module.

svn path=/nixos/trunk/; revision=33097
2012-03-15 07:19:17 +00:00
Yury G. Kudryashov
34c2f2cf58 gtkLibs.gtk moved to gtk
svn path=/nixos/trunk/; revision=33096
2012-03-15 07:19:12 +00:00
Shea Levy
001fcad421 First shot at EFI booting.
Note: This feature is INCOMPLETE. Moreover, when runEfibootmgr is true it will
MODIFY NVRAM and, on Apple systems, possibly brick your firmware. PLEASE be
careful while further testing is performed

svn path=/nixos/trunk/; revision=33047
2012-03-13 19:27:59 +00:00
Eelco Dolstra
db0e7787ce * Add a 32-bit AMI that finally seems to boot reliably.
svn path=/nixos/trunk/; revision=33034
2012-03-13 15:03:41 +00:00
Lluís Batlle i Rossell
dd6eb81797 Adding /etc/mdadm.conf, with the contents supplied at boot.initrd.mdadmConf.
This allows setting a fixed device name per array, thus ensuring that at boot,
the arrays will always be mounted with the same names. I think this allows
solving the problem of grub getting confused about softraid device names
(prefix and root), if the devices always get the same naming at initrd.


svn path=/nixos/trunk/; revision=33033
2012-03-13 13:26:21 +00:00
Eelco Dolstra
b6d43e1aca * Fix Amazon image generation (broken by r32913).
svn path=/nixos/trunk/; revision=33032
2012-03-13 13:17:43 +00:00
Eelco Dolstra
b4d16ef07e * Fix nixos-option.
svn path=/nixos/trunk/; revision=33031
2012-03-13 09:36:41 +00:00
Eelco Dolstra
f2870ea7b5 * tty1 needs to be treated specially because of the emergency-shell
job.

svn path=/nixos/trunk/; revision=33018
2012-03-12 14:42:52 +00:00
Eelco Dolstra
7f72dead3b * Fix the waitOnMounts option. For some reason we lost its
implementation.

svn path=/nixos/trunk/; revision=33017
2012-03-12 14:33:06 +00:00
Ludovic Courtès
5fad465261 BitlBee: Add `job.name'; cleanup white space.
svn path=/nixos/trunk/; revision=33012
2012-03-12 13:10:13 +00:00
Eelco Dolstra
7281a851b3 * Create a /usr/bin/env symlink. This allows scripts from other
distributions with shebang lines such as

    #! /usr/bin/env python

  to work correctly.

svn path=/nixos/trunk/; revision=33011
2012-03-12 10:41:39 +00:00
Lluís Batlle i Rossell
9e980235bd Properly filter a possible lack of "grub.device", in case of using only "grub.devices".
svn path=/nixos/trunk/; revision=33009
2012-03-12 09:42:24 +00:00
Lluís Batlle i Rossell
3c0fdaf877 Adding /dev/tty to the stage1, so 'more' and 'less' now page well.
svn path=/nixos/trunk/; revision=33006
2012-03-11 23:04:29 +00:00
Lluís Batlle i Rossell
ee163c2c80 Making the stage2 interpreter bash non-interactive, while keeping the
interactive shell with bash interactive. Suggested by Eelco.


svn path=/nixos/trunk/; revision=33005
2012-03-11 22:43:37 +00:00
Lluís Batlle i Rossell
1a48572b75 Disabling the initrd extra tools by default, until further review.
svn path=/nixos/trunk/; revision=33004
2012-03-11 22:28:31 +00:00
Lluís Batlle i Rossell
2fc537277b Removing a 'set -x' in the stage1 extra tools.
svn path=/nixos/trunk/; revision=33003
2012-03-11 22:26:01 +00:00
Lluís Batlle i Rossell
d2e2bb4bc4 Typo
svn path=/nixos/trunk/; revision=33002
2012-03-11 22:07:37 +00:00
Lluís Batlle i Rossell
331b1f46d3 Making the stage2 'debug2' spawn a shell with job control, like in stage1, running it in a
virtual terminal and not in the console. This brings wonderful things like ^C.


svn path=/nixos/trunk/; revision=33001
2012-03-11 22:01:46 +00:00
Lluís Batlle i Rossell
bbebba68f7 A more friendly stage1, with interactive bash, busybox plenty of tools, etc.
I set it as default because users can benefit of this without having to prepare
their nixos first, and I don't think it will break any nixos for the initrd
size increase.

It can be disabled with 'boot.initrd.withExtraTools = false'.


svn path=/nixos/trunk/; revision=33000
2012-03-11 21:56:47 +00:00
Lluís Batlle i Rossell
6a0958cc06 Making stage2 get a full interactive bash for the stage2 init, so there the shell has readline,
jobs, etc.


svn path=/nixos/trunk/; revision=32999
2012-03-11 21:50:35 +00:00
Lluís Batlle i Rossell
29ca7f2c80 Adding VIA_RHINE to the system tarball pc. I need to boot one with PXE and nfsroot with via rhine.
svn path=/nixos/trunk/; revision=32994
2012-03-11 16:39:49 +00:00
Mathijs Kwik
f68c95d1fe completely removed gw6c. use gogoclient
svn path=/nixos/trunk/; revision=32990
2012-03-11 14:36:39 +00:00
Florian Friesdorf
769cbaf56a fix postfix config, missing linebreak
svn path=/nixos/trunk/; revision=32980
2012-03-11 11:12:02 +00:00
Florian Friesdorf
5115e6a1d0 keep NIX_PATH in sudo env
fixes:
file `nixpkgs' was not found in the Nix search path (add it using $NIX_PATH or -I)

svn path=/nixos/trunk/; revision=32973
2012-03-10 16:11:40 +00:00
Eelco Dolstra
45fab492fc * nixos-hardware-scan: "acpi-cpufreq" is automatically loaded, so we
don't need to detect it.
* nixos-hardware-scan: don't use modulesPath.

svn path=/nixos/trunk/; revision=32972
2012-03-10 14:35:31 +00:00
Eelco Dolstra
de6968c163 * Virtualbox: use the right set of kernel packages.
svn path=/nixos/trunk/; revision=32971
2012-03-10 14:34:40 +00:00
Eelco Dolstra
9d89ca0c03 * Modularise vfat support. Also add fsck.vfat to the initrd. This
prevents errors when booting from VFAT (e.g. an ISO image converted
  using unetbootin).

svn path=/nixos/trunk/; revision=32956
2012-03-09 16:17:37 +00:00
Eelco Dolstra
03ebb883d1 * Modularize filesystem support. Filesystems such as btrfs and
reiserfs now have separate modules that are conditional on
  boot.supportedFilesystems and boot.initrd.supportedFilesystems.
  By default, these include the filesystems specified in the fsType
  attribute in fileSystems.  Ext2/3/4 support is currently
  unconditional.

  Also unbreak the installer test (http://hydra.nixos.org/build/2272302). 

svn path=/nixos/trunk/; revision=32954
2012-03-09 14:37:58 +00:00
Peter Simons
8708578181 services/printing/cupsd.nix: move the gstoraster.convs file from /etc/cups into the compiled backends directory in the store
svn path=/nixos/trunk/; revision=32951
2012-03-09 10:24:31 +00:00
Lluís Batlle i Rossell
13ac0a309b Allow a way to install grub to multiple devices (for /boot on soft raid arrays).
svn path=/nixos/trunk/; revision=32913
2012-03-08 21:37:30 +00:00
Lluís Batlle i Rossell
9d1b72a6c7 Making nixos fileSystems aware of fsType "reiserfs" and "btrfs", regarding
modules, tools, intrd pieces, ...

That's only useful if the user specifies fsType, though.


svn path=/nixos/trunk/; revision=32912
2012-03-08 21:07:25 +00:00
Lluís Batlle i Rossell
98dde13782 If enabling luks on initrd, also adding cryptsetup to system packages. I think it's useful.
svn path=/nixos/trunk/; revision=32910
2012-03-08 20:49:26 +00:00
Eelco Dolstra
e97817b577 * Atomically replace the /bin/sh symlink; otherwise there is a time
window in which /bin/sh is missing.  This can cause concurrently
  running programs to fail (e.g. Hydra jobs =>
  http://hydra.nixos.org/build/2267831).  You'd think the odds of this
  are very low, but they're not.

svn path=/nixos/trunk/; revision=32901
2012-03-08 16:08:03 +00:00
Eelco Dolstra
4869175158 * Fix the installer. The nixos-config element in $NIX_PATH was not
set (and neither was $NIXOS_CONFIG).
  (http://hydra.nixos.org/build/2230309).

svn path=/nixos/trunk/; revision=32857
2012-03-07 21:17:46 +00:00
Eelco Dolstra
a2417fd92f * Another workaround for the bug in substitute.
svn path=/nixos/trunk/; revision=32814
2012-03-06 10:57:52 +00:00
Eelco Dolstra
974a74ad49 * enableWLAN -> wireless.enable.
svn path=/nixos/trunk/; revision=32788
2012-03-04 21:15:34 +00:00
Lluís Batlle i Rossell
0b8e992d3d Setting the kernel 3.2 for the new-kernel nixos iso.
svn path=/nixos/trunk/; revision=32785
2012-03-04 21:01:20 +00:00
Lluís Batlle i Rossell
1adaabef58 Adding an option to luksroot, so it allows to define whether to launch cryptsetup after or before LVM.
To allow dmcrypt over lvm and lvm over dmcrypt.


svn path=/nixos/trunk/; revision=32784
2012-03-04 21:00:35 +00:00
Eelco Dolstra
0d4eb37e16 * Fix the NixOS jobset.
svn path=/nixos/trunk/; revision=32783
2012-03-04 20:57:34 +00:00
Mathijs Kwik
7d964498b8 changed the way networking-providers plug themselves before "networking"
svn path=/nixos/trunk/; revision=32781
2012-03-04 18:44:47 +00:00
Mathijs Kwik
8bfe513e75 renamed "all-interfaces" to "networking"
svn path=/nixos/trunk/; revision=32780
2012-03-04 18:44:42 +00:00
Eelco Dolstra
29b6b8769f * On second thought, let's not enable user support in Upstart. The
first user job I put in ~/.init caused Upstart to crash with an
  assertion failure, taking down the system.  Given that Upstart has a
  non-trivial attack surface with this feature, it seems best to
  disable it.

svn path=/nixos/trunk/; revision=32779
2012-03-04 17:49:00 +00:00
Eelco Dolstra
835170fe19 * Remove debug statement.
svn path=/nixos/trunk/; revision=32778
2012-03-04 17:21:33 +00:00
Eelco Dolstra
356ff79400 * wpa_supplicant: automatically figure out the wireless interface(s)
on which to run wpa_supplicant, unless they're set explicitly.

svn path=/nixos/trunk/; revision=32777
2012-03-04 17:21:14 +00:00
Eelco Dolstra
8935db253c * Upstart jobs: don't emit a description if there is none.
svn path=/nixos/trunk/; revision=32775
2012-03-04 16:17:56 +00:00
Eelco Dolstra
e11e9b4ef0 * Provide info's manpage.
svn path=/nixos/trunk/; revision=32774
2012-03-04 16:10:19 +00:00
Eelco Dolstra
2ac5df3a93 * Undo unintended commit.
svn path=/nixos/trunk/; revision=32771
2012-03-04 15:48:58 +00:00
Eelco Dolstra
6c792b3d9e * A more pragmatic solution to the missing tar manpage problem.
svn path=/nixos/trunk/; revision=32770
2012-03-04 15:47:44 +00:00
Eelco Dolstra
0d39390ad4 * ntpd: cleanup.
svn path=/nixos/trunk/; revision=32769
2012-03-04 15:34:44 +00:00
Eelco Dolstra
545f922e71 * Connect Upstart to the system bus so that non-root users can run
initctl.

svn path=/nixos/trunk/; revision=32768
2012-03-04 15:10:14 +00:00
Mathijs Kwik
3c957bd921 gogoclient: ipv6 tunnel module
meant to replace the obsolete gw6c module
builds fine on stdenv-updates branch

svn path=/nixos/trunk/; revision=32767
2012-03-04 12:58:22 +00:00
Mathijs Kwik
86bf5566fe many daemons: depend on all-interfaces instead of gw6c
svn path=/nixos/trunk/; revision=32766
2012-03-04 12:58:18 +00:00
Mathijs Kwik
ce83d3580e gw6c: provide support for all-interfaces
svn path=/nixos/trunk/; revision=32765
2012-03-04 12:58:14 +00:00
Mathijs Kwik
77240b46f1 all-interfaces event
many services depend on other services that bring up network interfaces.
Examples are ipv6 tunneling clients or VPNs.

As there are multiple choices for these network-interface-providing services,
it's not nice to hardcore these deps in every service.
This change sets up a generic config option for this purpose.

providers (gw6c/gogoclient/openvpn) can plug into this to signal they bring up
an important interface.

Daemons that need these interfaces, can then depend on the 'all-interfaces' event,
instead of the individual services.

By default, the event fires when network-interfaces completes.

svn path=/nixos/trunk/; revision=32764
2012-03-04 12:58:11 +00:00
Mathijs Kwik
6240825e27 mongodb: use the new upstart setuid option
svn path=/nixos/trunk/; revision=32763
2012-03-04 12:58:09 +00:00
Mathijs Kwik
dc8ca0ea4a upstart: options for setuid and setgid
as jobs running as different users cannot create their logfile, I moved that to an activationScript

svn path=/nixos/trunk/; revision=32762
2012-03-04 12:58:06 +00:00
Lluís Batlle i Rossell
79d4b11aeb Making the luks thing of initrd a bit more flexible. I used it to get a
ciphered swap, where I could hibernate ciphered.


svn path=/nixos/trunk/; revision=32754
2012-03-03 16:07:18 +00:00
Lluís Batlle i Rossell
1b65b427c3 Setting gnutarWithMan in the system path, instead of gnutar. Thus 'man tar'
would work by default.


svn path=/nixos/trunk/; revision=32750
2012-03-03 09:55:08 +00:00
Eelco Dolstra
57cd376016 * Decompress properly.
svn path=/nixos/trunk/; revision=32748
2012-03-02 17:06:33 +00:00
Eelco Dolstra
ee0769cc42 * If debug2 is passed on the kernel command line, run Upstart with
the --verbose flag to see what it's doing.

svn path=/nixos/trunk/; revision=32747
2012-03-02 16:37:28 +00:00
Eelco Dolstra
5d5fc5f675 * Add an option ‘deployment.virtualbox.baseImage’ to specify the
VirtualBox/Charon base image.

svn path=/nixos/trunk/; revision=32743
2012-03-02 14:01:57 +00:00
Eelco Dolstra
65824d40e1 * nixos-rebuild: pass on the -I option to nix-build.
svn path=/nixos/trunk/; revision=32741
2012-03-02 13:31:12 +00:00
Eelco Dolstra
f61ad97833 * Run the stage 2 debug shell at a more useful point (just before
starting Upstart).  This also causes $PATH to be set to something
  more sensible.

svn path=/nixos/trunk/; revision=32740
2012-03-02 13:17:05 +00:00
Eelco Dolstra
29d84af677 * Remove the use of the NIXPKGS and NIXOS environment variables.
Instead use $NIX_PATH.  NIXOS_CONFIG is still supported.

svn path=/nixos/trunk/; revision=32739
2012-03-02 12:38:22 +00:00
Eelco Dolstra
a6f410f144 * Obsolete security.extraSetuidPrograms.
svn path=/nixos/trunk/; revision=32723
2012-03-01 20:10:46 +00:00
Eelco Dolstra
58c6231a20 * Added a module for enabling VirtualBox.
svn path=/nixos/trunk/; revision=32722
2012-03-01 20:10:08 +00:00
Eelco Dolstra
e8539b6f60 * Generate a resolvconf.conf file for openresolv.
svn path=/nixos/trunk/; revision=32718
2012-03-01 14:46:47 +00:00
Eelco Dolstra
742198c6ea * dhcpcd: Ignore vboxnet*.
svn path=/nixos/trunk/; revision=32716
2012-03-01 13:49:47 +00:00
Peter Simons
8c88506e05 modules/config/networking.nix: list extraHosts *after* the local hostname
This change allows using extraHosts to specify additional aliases for 127.0.0.1
without overriding the local hostname in the process.

svn path=/nixos/trunk/; revision=32711
2012-02-29 21:25:12 +00:00
Peter Simons
e872efaa8d fixed mongodb upstart task
svn path=/nixos/trunk/; revision=32683
2012-02-28 17:43:54 +00:00
Peter Simons
b5dc3d520e optionally run "btrfs device scan" during mountall.
As reported by Bryce L Nordgren.

Multi-disk btrfs filesystems need to get assembled first before they become mountable.
Enable this by explicitly assigning fsType = "btrfs" in the filesystems list in configuration.nix

svn path=/nixos/trunk/; revision=32682
2012-02-28 17:43:43 +00:00
Eelco Dolstra
4f8d076ae7 * Allow the start/stop condition of OpenVPN jobs to be overriden
easily.

svn path=/nixos/trunk/; revision=32673
2012-02-28 10:30:12 +00:00
Eelco Dolstra
f55cf99c7c * Typo.
svn path=/nixos/trunk/; revision=32571
2012-02-26 00:12:04 +00:00
Eelco Dolstra
933ce8e9c8 * Module for building a VirtualBox disk image (.vdi). TODO: merge
this with the Amazon and Nova image builders.

svn path=/nixos/trunk/; revision=32570
2012-02-25 21:36:00 +00:00
Eelco Dolstra
aa77ba0c19 * Forgot this.
svn path=/nixos/trunk/; revision=32566
2012-02-25 20:11:04 +00:00
Eelco Dolstra
d9d6fb58e4 * Prevent the VirtualBox guest additions from being restarted
constantly by Upstart.  Also move the module to a better location.

svn path=/nixos/trunk/; revision=32565
2012-02-25 20:10:53 +00:00
Eelco Dolstra
acea54b3c6 * In the users...keyFiles option, the "string" type doesn't work very
well because elements could be paths, e.g.

    users.extraUsers.root.openssh.authorizedKeys.keyFiles =
      [ ./id_key.pub ];

  So disable the type check for now.

svn path=/nixos/trunk/; revision=32558
2012-02-25 17:31:39 +00:00
Eelco Dolstra
8f8472d444 * Fix bad default.
svn path=/nixos/trunk/; revision=32525
2012-02-23 21:25:22 +00:00
Peter Simons
f0dfd7d06a made kde4's phonon backends configurable
svn path=/nixos/trunk/; revision=32481
2012-02-22 20:29:00 +00:00
Peter Simons
90adc800c5 sshd: choose host key type
svn path=/nixos/trunk/; revision=32479
2012-02-22 20:28:54 +00:00
Peter Simons
fca4803a74 gw6c: no built-in log rotation, we use logrotate for that
svn path=/nixos/trunk/; revision=32478
2012-02-22 20:28:51 +00:00
Peter Simons
87c102ce2e intel microcode update module
svn path=/nixos/trunk/; revision=32477
2012-02-22 20:28:44 +00:00
Arie Middelkoop
57af9d74e2 Applied the patch of James Cook.
svn path=/nixos/trunk/; revision=32445
2012-02-21 10:02:58 +00:00
Eelco Dolstra
b2910df04e * Various cleanups in the OpenVPN module. The option
‘services.openvpn.enable’ is now obsolete; specifying instances in
  ‘services.openvpn.servers’ is enough.

svn path=/nixos/trunk/; revision=32441
2012-02-20 20:10:07 +00:00
Eelco Dolstra
84bff53ca7 * Set the default value for the ‘path’ job attribute using the NixOS
module system so that it can be overriden.  Also use an ‘apply’ to
  compute the actual $PATH.

svn path=/nixos/trunk/; revision=32440
2012-02-20 19:23:15 +00:00
Eelco Dolstra
35734279ae * Fix incorrect default value.
svn path=/nixos/trunk/; revision=32431
2012-02-20 16:53:44 +00:00
Eelco Dolstra
4e9c8d0b9d * dhcpcd: restart ntpd and emit ip-up/ip-down events. Also attach the
interface name to the events, as suggested by Mathijs Kwik.

svn path=/nixos/trunk/; revision=32430
2012-02-20 15:19:46 +00:00
Eelco Dolstra
a46fd58b3d * Use the networking.useDHCP out of the dhclient module.
svn path=/nixos/trunk/; revision=32428
2012-02-20 14:29:21 +00:00
Eelco Dolstra
7278e37072 * Don't set DBHost if the database is on localhost, otherwise Zabbix
will use TCP/IP instead of a Unix domain socket.
* Simplify Zabbix's start condition.  Zabbix now retries if the
  database is down instead of bailing out.

svn path=/nixos/trunk/; revision=32426
2012-02-20 13:40:47 +00:00
Eelco Dolstra
1770b5a400 * dhcpcd: use a configuration file. Use the "denyinterfaces" option
to simplify the start script.  Drop the ifplugd hook because dhcpcd
  monitors interface link status itself.

svn path=/nixos/trunk/; revision=32424
2012-02-20 13:13:29 +00:00
Eelco Dolstra
ae27eafe4c * Added a module for dhcpcd, a DHCP client (not enabled by default
yet).  It's smaller than dhclient and has more features
  (e.g. automatically detects link status changes, supports
  openresolv, does IPv4LL, and supports IPv6 Router Advertisements).

svn path=/nixos/trunk/; revision=32413
2012-02-20 01:17:53 +00:00
Eelco Dolstra
a218a602d4 * Use openresolv to set the static nameserver configuration. Next
step is to get the DHCP client, OpenVPN etc. to use openresolv as
  well.

svn path=/nixos/trunk/; revision=32411
2012-02-20 00:00:50 +00:00
Eelco Dolstra
1707d1130f * Move the dhclient/wpa_supplicant restart actions out of the ifplugd
module.

svn path=/nixos/trunk/; revision=32409
2012-02-19 22:53:25 +00:00
Lluís Batlle i Rossell
5c6165ef9f Reverting 32228. That was an incomplete change I had in the working directory.
svn path=/nixos/trunk/; revision=32308
2012-02-15 16:46:25 +00:00
Lluís Batlle i Rossell
97e0131291 Adding support for 3c59x NICs to the system-tarball-pc.
svn path=/nixos/trunk/; revision=32229
2012-02-11 21:13:10 +00:00
Lluís Batlle i Rossell
cc1daf97c7 Adding extra options for resolv.conf
svn path=/nixos/trunk/; revision=32228
2012-02-11 21:11:05 +00:00
Sander van der Burg
3a9dfceb07 Implemented a very very dirty hack, which makes it possible to statically determine which activation types are supported, instead of determining this by the avahi service
svn path=/nixos/trunk/; revision=32089
2012-02-06 22:49:41 +00:00
Peter Simons
89d5aa4dd2 nixos support for nvidia optimus
currently, only support for fully disabling nvidia is provided, which
is helpful for saving power/heat.

In the future, this should be extended so we can choose:

- nvidia only  (choose between nouveau/nvidia driver)
- IGP only
- Hybrid (choose between nouveau/nvidia driver, use the "bumblebee" package/daemon)

svn path=/nixos/trunk/; revision=32085
2012-02-06 19:14:42 +00:00
Peter Simons
49a3e57d43 frandom: very fast kernel random number generator
svn path=/nixos/trunk/; revision=32084
2012-02-06 19:14:37 +00:00
Peter Simons
4f7985a1bd mongodb: workaround for shutdown issues
svn path=/nixos/trunk/; revision=32083
2012-02-06 19:14:33 +00:00
Sander van der Burg
4249f803ad Removed some tabs
svn path=/nixos/trunk/; revision=32051
2012-02-06 14:04:15 +00:00
Sander van der Burg
82ca072c23 Added extraWorkersProperties parameter, so that custom tweaks can be added
svn path=/nixos/trunk/; revision=32050
2012-02-06 13:11:48 +00:00
Sander van der Burg
5363c8b8ae Remove ugly pkgs.tomcat6 references
svn path=/nixos/trunk/; revision=32049
2012-02-06 13:03:56 +00:00
Eelco Dolstra
b11a33717f * zabbix-server: don't require PostgreSQL to be started
if we're using a remote server.

svn path=/nixos/trunk/; revision=31852
2012-01-26 13:32:02 +00:00
Florian Friesdorf
fa344f60d9 pathsToLink: emacs org mode contrib folder
svn path=/nixos/trunk/; revision=31795
2012-01-23 17:14:24 +00:00
Eelco Dolstra
aca8225e3b * Invalidate the nscd hosts cache when an "ip-up" event occurs. This
event is emitted by dhclient and by the network-interfaces job in
  case of statically configured interfaces.  Invalidating the cache is
  necessary to get rid of negative queries.

svn path=/nixos/trunk/; revision=31779
2012-01-21 19:13:43 +00:00
Sander van der Burg
9a09051f4b Added MySQL 5.5 NixOS service
svn path=/nixos/trunk/; revision=31732
2012-01-20 10:43:18 +00:00
Peter Simons
ec445fbee7 mongodb nixos module
svn path=/nixos/trunk/; revision=31658
2012-01-18 20:34:07 +00:00
Peter Simons
5144e94694 gw6c: fixed faulty path reference
svn path=/nixos/trunk/; revision=31657
2012-01-18 20:34:04 +00:00
Sander van der Burg
1e59a18f90 Only use mysqladmin authentication if we have supplied a root password
svn path=/nixos/trunk/; revision=31632
2012-01-18 15:21:11 +00:00
Sander van der Burg
d4b6aa3553 The MySQL upstart job does not monitor the mysqld process anymore. Instead it is shut down by mysqladmin tool in the postStop phase. Under high load, upstart may send a KILL signal to the mysql daemon, which may cause data corruption.
svn path=/nixos/trunk/; revision=31621
2012-01-18 15:01:44 +00:00
Eelco Dolstra
5d12152b13 * Enable xfce4-appfinder.
svn path=/nixos/trunk/; revision=31612
2012-01-17 18:15:20 +00:00
Arie Middelkoop
609a02906e Another type error fix ("The example shouldn't be a string either").
svn path=/nixos/trunk/; revision=31538
2012-01-14 12:24:41 +00:00
Arie Middelkoop
2f49427e4f Fixed the default value for the palmDetect synaptics option (empty string -> false).
svn path=/nixos/trunk/; revision=31529
2012-01-14 09:40:08 +00:00
Arie Middelkoop
4d26262878 Some renaming as was mentioned on the mailinglist.
Also, removed the firmware-free option because that firmware is already in the kernel package and thus causing collisions otherwise.

svn path=/nixos/trunk/; revision=31527
2012-01-14 09:30:24 +00:00
Arie Middelkoop
50d7a38c82 Added the "conservative" governer to the loaded cpufreq governors when you enable powermanagement.
svn path=/nixos/trunk/; revision=31524
2012-01-13 22:25:16 +00:00
Arie Middelkoop
bf1bf4957c Additional options for synaptics
How can you ever work with a touchpad while having finger taps on...

svn path=/nixos/trunk/; revision=31523
2012-01-13 22:23:18 +00:00
Eelco Dolstra
cc41bce79d * Prevent merging of some options. P.S. maybe string options
should be "uniq" by default.

svn path=/nixos/trunk/; revision=31520
2012-01-13 13:26:52 +00:00
Florian Friesdorf
7be82b3f59 fix scsi-link-power-management.nix which broke cpufreq
svn path=/nixos/trunk/; revision=31507
2012-01-13 08:46:32 +00:00
Arie Middelkoop
3ef0f14925 Added an option to enable the firmware from 'firmware-linux-nonfree' and 'firmware-linux-free'.
svn path=/nixos/trunk/; revision=31502
2012-01-12 17:17:01 +00:00
Florian Friesdorf
0862ca9fa7 sudoers: LOCALE_ARCHIVE, TERMINFO_DIRS for root and %wheel
svn path=/nixos/trunk/; revision=31491
2012-01-12 07:54:14 +00:00
Florian Friesdorf
f169f60575 powerManagement.enable sets link_power_management_policy to min_power
svn path=/nixos/trunk/; revision=31490
2012-01-12 07:54:09 +00:00
Peter Simons
036e585b42 modules/services/printing/cupsd.nix: tell cups to use 'gstoraster' instead of 'pstoraster'
The CUPS filter has been renamed in GNU Ghostscript 9.x. Fortunately,
Ghostscript ships with a MIME conversions file that informs CUPS about this,
so linking that file into /etc/cups works fine. I'm not sure whether it's a
particularly elegant solution, though.

svn path=/nixos/trunk/; revision=31489
2012-01-11 23:17:36 +00:00
Yury G. Kudryashov
98f5e3b3b2 Drop kde4.5-specific code
svn path=/nixos/trunk/; revision=31486
2012-01-11 22:58:32 +00:00
Peter Simons
70850268e0 Revert "modules/services/printing/cupsd.nix: fixed path to DataDir"
This reverts commit 2a1ce489154c8543bc146a7d99e1a397eb920e1f.

svn path=/nixos/trunk/; revision=31484
2012-01-11 20:48:40 +00:00
Peter Simons
cab4a28361 synaptics: add 'additionalOptions' option
svn path=/nixos/trunk/; revision=31469
2012-01-10 18:40:02 +00:00
Peter Simons
6385d51f7e modules/services/printing/cupsd.nix: fixed path to DataDir
svn path=/nixos/trunk/; revision=31457
2012-01-09 16:03:43 +00:00
Florian Friesdorf
66f82c043e Revert "Revert "add ~/bin to PATH if it exists""
sorry m(

svn path=/nixos/trunk/; revision=31246
2012-01-03 17:29:20 +00:00
Florian Friesdorf
68e9f2e09b Revert "add ~/bin to PATH if it exists"
This reverts commit 73bda7c4575b5664d54340db95fec2fa759b6f28.

svn path=/nixos/trunk/; revision=31243
2012-01-03 17:11:21 +00:00
Florian Friesdorf
7b7976ac01 export NIX_PROFILES and NIX_USER_PROFILE_DIR
svn path=/nixos/trunk/; revision=31242
2012-01-03 17:11:19 +00:00
Florian Friesdorf
b4765401af add ~/bin to PATH if it exists
svn path=/nixos/trunk/; revision=31235
2012-01-03 14:36:05 +00:00
Florian Friesdorf
007d56b69f intel-5150.nix: add Intel 5150 wireless firmware support
Author:    Sergey Mironov <ierton@gmail.com>

svn path=/nixos/trunk/; revision=31231
2012-01-03 14:12:41 +00:00
Peter Simons
8eca4db54a /etc/profile: do not add ~/bin to $PATH in system-wide init file
Users who want a user-specific bin directory to override system paths should
configure that in their user-specific ~/.bashrc, not in the system-wide init
file. The global file shouldn't add directories from user homes to $PATH
without knowing whether those actually exist or whether the users even want
them in $PATH. On my system, for example, there is no ~/bin, so I don't want my
$PATH to look for one. Removing an erroneous entry from $PATH is cumbersome,
but adding one is easy, so it feels better to err on the side of caution.

svn path=/nixos/trunk/; revision=31188
2011-12-31 12:56:45 +00:00
Florian Friesdorf
ea121d0ff9 Revert "EMACSLOADPATH in /etc/profile"
svn path=/nixos/trunk/; revision=31187
2011-12-31 06:24:12 +00:00
Florian Friesdorf
a38ca160ec EMACSLOADPATH in /etc/profile
svn path=/nixos/trunk/; revision=31175
2011-12-31 04:14:36 +00:00
Florian Friesdorf
b0fefb876f unset MOZ_PLUGIN_PATH and TERMINFO_DIRS before setting them
svn path=/nixos/trunk/; revision=31174
2011-12-31 04:14:31 +00:00
Florian Friesdorf
221c637356 fix MOZ_PLUGIN_PATH
svn path=/nixos/trunk/; revision=31168
2011-12-31 02:57:45 +00:00
Florian Friesdorf
97ce0b1386 MOZ_PLUGIN_PATH based on NIX_PROFILES
svn path=/nixos/trunk/; revision=31167
2011-12-31 02:05:51 +00:00
Florian Friesdorf
76986a24f9 enable noX11 on kernel cmdline to suppress start of X
xserver is started on start_xserver event, which is emitted by
check_for_xserver_start if there is no "noX11" on the kernel cmdline.

Thanks to viric for the general idea.

svn path=/nixos/trunk/; revision=31166
2011-12-31 00:24:48 +00:00
Florian Friesdorf
5b7e7bb429 services.xserver.xkbVariant
svn path=/nixos/trunk/; revision=31165
2011-12-30 23:26:11 +00:00
Florian Friesdorf
da90f06ff8 4965agn was wrongly detected as a 3945abg
svn path=/nixos/trunk/; revision=31164
2011-12-30 23:26:06 +00:00
Peter Simons
e91c6ea1ce modules/system/upstart-events/shutdown.nix: refer to bash binary with full path
Upstart won't find a "bash" binary in $PATH when those commands are run, so we
refer to it using an absolute path.

svn path=/nixos/trunk/; revision=31157
2011-12-30 16:57:39 +00:00
Florian Friesdorf
b2eb54ae5a set TERMINFO_DIRS according to NIX_PROFILES
this finally makes rxvt-unicode work without manually linking it's terminfo

svn path=/nixos/trunk/; revision=31145
2011-12-29 19:38:03 +00:00
Florian Friesdorf
05a49f663e include /share/terminfo into default pathsToLink
svn path=/nixos/trunk/; revision=31144
2011-12-29 19:38:00 +00:00
Florian Friesdorf
8ed89125b5 linewrap pathsToLink
svn path=/nixos/trunk/; revision=31143
2011-12-29 19:37:54 +00:00
Nicolas Pierron
338bc7b9f8 Fix nixos-option without argument.
svn path=/nixos/trunk/; revision=31139
2011-12-29 06:33:34 +00:00
Florian Friesdorf
eb755d4692 switched all mergeOptionString to pkgs.lib.types.string
pierron recommended the use of types.string over mergeOptionString, as
it is superior but might break things.

For my system the change evaluated to the exactly same.

svn path=/nixos/trunk/; revision=31138
2011-12-29 00:51:35 +00:00
Florian Friesdorf
3ebc7727f7 Revert "test we have cryptsetup-1.4.1 in initrd"
This reverts commit 025f8c40b40fad50086e8761eee61098d8fb2651.

The check was intened for building the initrd of the installer.

svn path=/nixos/trunk/; revision=31137
2011-12-28 22:37:38 +00:00
Florian Friesdorf
0544a008db Revert "added an "error" to luksroot that should be caught"
This reverts commit c7967af35a13f68a8785c142582b639dc8c8e92c.

svn path=/nixos/trunk/; revision=31136
2011-12-28 22:36:26 +00:00
Florian Friesdorf
829bd9a727 added an "error" to luksroot that should be caught
svn path=/nixos/trunk/; revision=31135
2011-12-28 22:21:31 +00:00
Florian Friesdorf
c7fd05a650 test we have cryptsetup-1.4.1 in initrd
svn path=/nixos/trunk/; revision=31132
2011-12-28 21:46:50 +00:00
Florian Friesdorf
c15aa7aea3 luksroot uses preLVMCommands instead of postDeviceCommands
svn path=/nixos/trunk/; revision=31131
2011-12-28 21:46:48 +00:00
Florian Friesdorf
90756a787c add preLVMCommands hook
svn path=/nixos/trunk/; revision=31130
2011-12-28 21:46:45 +00:00
Florian Friesdorf
0a9f3a36ec luksroot waits for usb drive
svn path=/nixos/trunk/; revision=31129
2011-12-28 21:46:42 +00:00
Florian Friesdorf
dd8e725d7d copy only cryptsetup deps to stage-1 and test cryptsetup
popt-0.16 and cryptsetup-1.4.1 both generated pkgconfig (in contrast
to older versions). The pkgconfig files (popt.pc and cryptsetup.pc)
contain references into the store that are not removed by patchelf and
stage-1 fails with errors like: "output is not allowed to refer to
path `/nix/store/qccjhn063cfv171rcaxvxh0yk96zf7l2-cryptsetup-1.4.1'".

Now, only the cryptsetup binaries and its dependencies are copied,
determined by ldd. In addition the cryptsetup binary and lvm are
tested after patchelf has adjusted the library paths.

Thanks to Peter Simons and Eelco Dolstra for giving the rights hints.

svn path=/nixos/trunk/; revision=31128
2011-12-28 21:46:40 +00:00
Florian Friesdorf
d98ecd1d9e enable testing of extraUtilsCommands after patchelf
svn path=/nixos/trunk/; revision=31127
2011-12-28 21:46:35 +00:00
Lluís Batlle i Rossell
5cf6543e6e Removing unused lines of the nfs-kernel script, and fixing some indentation.
svn path=/nixos/trunk/; revision=31120
2011-12-28 09:05:52 +00:00
Lluís Batlle i Rossell
99cca93398 Fixing the race condition on loading nfsd. It was not a modprobe thing like I
said on 31113, but again, upstart order.

I restore the usual modprobe procedure.


svn path=/nixos/trunk/; revision=31119
2011-12-28 08:44:24 +00:00
Lluís Batlle i Rossell
ef1755f3c0 I had a bug in my nfs server... just after boot, all clients were receiving
"Permission denied" until I run "restart nfs-kernel-exports". "exportfs -ra" did not help.

I tracked that down to some race condition between loading the module nfsd and
starting the daemons. Therefore, I decided to add nfsd to the boot.kernelModules instead
of using modprove with it.

Now it works for my server. No more Permission denied after reboot.


svn path=/nixos/trunk/; revision=31113
2011-12-27 18:08:05 +00:00
Lluís Batlle i Rossell
8bc381c4cd Fixing the boot sequence in case of only having nfsKernel.client.enable = true, and not server.
svn path=/nixos/trunk/; revision=31109
2011-12-27 16:33:10 +00:00
Lluís Batlle i Rossell
0de75cde39 Asking for an interactive shell in case of error umounting filesystems. I've
not tested it; sometimes I hit the trouble, but not always.


svn path=/nixos/trunk/; revision=31104
2011-12-26 16:40:13 +00:00
Lluís Batlle i Rossell
2c77b292a6 I reworked the nfs upstart jobs, so they work better on the events of interest of nixos.
Related to http://yellowgrass.org/issue/NixOS/109 .


svn path=/nixos/trunk/; revision=31103
2011-12-26 16:06:20 +00:00
Eelco Dolstra
cf36b3db80 * If power management is enabled, set the governor to ‘ondemand’ by
default.  See
  
    http://www.codon.org.uk/~mjg59/power/good_practices.html
    
  for the reasoning.  (Basically, the ‘performance’ and ‘powersave’
  governors don't actually provide extra performance or power savings
  in most cases.)

  It used to be that desktop environments like KDE were able to set
  the governor through HAL (e.g. KDE could be configured to switch to
  the powersave governor when the user unplugs his laptop).  However,
  this is no longer the case with upower — it is now expected that
  everybody uses the ondemand governor.  See

    http://old.nabble.com/-PATCH--powerdevil-remove-cpufreq.patch-td27815354.html

* Rename ‘cpuFreqGovernor’ to ‘powerManagement.cpuFreqGovernor’.

* Include cpufreq-utils in the system path if a governor is set, since
  we depend on it anyway.

svn path=/nixos/trunk/; revision=30991
2011-12-20 22:44:58 +00:00
Eelco Dolstra
2ff7b1284a * Handle the util-linux-ng -> util-linux rename
(http://hydra.nixos.org/build/1646277/nixlog/1).

svn path=/nixos/trunk/; revision=30984
2011-12-20 13:36:11 +00:00
Michael Raskin
d06c45ec86 Let hostname --fqdn find proper hostname
svn path=/nixos/trunk/; revision=30976
2011-12-20 12:35:12 +00:00
Yury G. Kudryashov
a87a1bca04 wpa_supplicant: add D-Bus interface
svn path=/nixos/trunk/; revision=30972
2011-12-19 23:16:32 +00:00
Peter Simons
ae82e7b048 Added cpuFreqGovernor option to configure a CPU frequency governor.
svn path=/nixos/trunk/; revision=30949
2011-12-16 23:44:37 +00:00
Eelco Dolstra
52e6088c88 * utillinuxng -> utillinux.
svn path=/nixos/trunk/; revision=30858
2011-12-12 19:02:37 +00:00
Eelco Dolstra
6e95485a28 * Set boot.vesa to false if we don't have a fbcondecor-enabled kernel.
svn path=/nixos/trunk/; revision=30802
2011-12-08 12:25:33 +00:00
Shea Levy
e87764e327 Apply mornfall's SANE patches
Fix sane-backends to generate udev rules, add a snapshot of sane-backends's unstable repo, and add a SANE nixos module

svn path=/nixos/trunk/; revision=30764
2011-12-05 17:32:45 +00:00
Shea Levy
72d7401976 udev: Ignore commented lines when populating run_progs.
Patch by mornfall

svn path=/nixos/trunk/; revision=30763
2011-12-05 16:53:58 +00:00
Shea Levy
868c60c92b Add mpd module
There is room for improvement here. The options in conffile could be broken out into individual options and an extraConfig option added. But I think this looks right.
Patch by mornfall, slightly modified by me

svn path=/nixos/trunk/; revision=30731
2011-12-05 01:51:05 +00:00
Eelco Dolstra
508fea8dac * Remove the cfq_iosched module.
svn path=/nixos/trunk/; revision=30618
2011-11-29 14:19:55 +00:00
Nicolas Pierron
e264d1ab79 Convert users.extraUsers to an option set and add support for openssh
authorized_keys file generation.

svn path=/nixos/trunk/; revision=30611
2011-11-29 06:08:55 +00:00
Peter Simons
e4ba69aecf wvdial: don't make wvdial a system package; only root can run it
svn path=/nixos/trunk/; revision=30570
2011-11-25 17:41:47 +00:00
Peter Simons
0cd9ff9fcc smartd: run smartd daemon using the given search path to improve readability of ps output
svn path=/nixos/trunk/; revision=30569
2011-11-25 17:09:44 +00:00
Peter Simons
ef932017fc smartd: run the mail notification script with ${pkgs.stdenv.shell} rather than /bin/sh
svn path=/nixos/trunk/; revision=30568
2011-11-25 17:09:37 +00:00
Eelco Dolstra
8eba736da9 * Use the ‘path’ attribute in Upstart jobs in more places. It's a bit
more readable (also in "ps" output).

svn path=/nixos/trunk/; revision=30565
2011-11-25 16:32:54 +00:00
Eelco Dolstra
1d5d7036d0 * Add a module for managing cgroups.
svn path=/nixos/trunk/; revision=30551
2011-11-24 18:28:45 +00:00
Peter Simons
9de905ee61 modules/programs/wvdial.nix: added support for configuring wvdial
For example, I use the following settings to configure T-Mobile Internet
access on my laptop, which is connected to the cell phone by USB:

 | environment.wvdial.dialerDefaults = ''
 |   Init1 = AT+CGDCONT=1,"IP","internet.t-mobile"
 |   Modem Type = USB Modem
 |   Phone = *99#
 |   ISDN = 0
 |   Username = tm
 |   Password = tm
 |   Modem = /dev/ttyACM0
 |   Baud = 460800
 | '';

svn path=/nixos/trunk/; revision=30489
2011-11-20 10:38:26 +00:00
Eelco Dolstra
d89f4b6c76 * Revert r30370, it's no longer needed.
svn path=/nixos/trunk/; revision=30389
2011-11-11 15:02:30 +00:00
Eelco Dolstra
48adcd5510 * Remove xdpyinfo from the $PATH.
svn path=/nixos/trunk/; revision=30388
2011-11-11 03:11:32 +00:00