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
..
config	* Disable "nixos-gen-seccure-keys": it's not clear what it's for, it's	2012-04-10 21:11:11 +00:00
hardware	* Move the implementation of boot.kernelModules to udev's postStart.	2012-03-18 14:03:42 +00:00
installer	Reverting 33692, because memtest in the iso was failing.	2012-04-10 21:18:48 +00:00
misc	* Add a command "nixos-version" that prints the version of the	2012-04-10 20:56:38 +00:00
profiles	* Add a command "nixos-version" that prints the version of the	2012-04-10 20:56:38 +00:00
programs	assertions '.msg' doesn't exist => .message	2012-04-01 10:54:06 +00:00
security	keep NIX_PATH in sudo env	2012-03-10 16:11:40 +00:00
services	* Drop ugly reference to var/run/current-system/sw/sbin/wpa_cli, and	2012-04-10 12:07:30 +00:00
system	Dropped the unused/unknown/obsolete module i8042 from 'boot.initrd.kernelModules'.	2012-04-06 19:21:50 +00:00
tasks	* The idmapd job requires the sunrpc kernel module to be loaded.	2012-03-22 13:01:06 +00:00
testing	* Attempt to fix the random "udevadm settle - timeout of 120 seconds	2012-03-19 15:10:39 +00:00
virtualisation	* Don't put /var and /nix on ephemeral storage if we're booting	2012-04-10 11:11:05 +00:00
module-list.nix	* Add a command "nixos-version" that prints the version of the	2012-04-10 20:56:38 +00:00
rename.nix	* wpa_supplicant: automatically figure out the wireless interface(s)	2012-03-04 17:21:14 +00:00