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
..
cd-dvd	Reverting 33692, because memtest in the iso was failing.	2012-04-10 21:18:48 +00:00
efi-boot-stub	efi-boot-stub: Give startup.sh files more descriptive names	2012-03-21 02:05:52 +00:00
generations-dir	Reverting revisions 30103-30106: "always set nixpkgs.config.{state,store}Dir", etc.	2011-10-30 15:19:58 +00:00
grub	Making also the system-tarball-pc show the memtest entry as the	2012-04-09 20:37:54 +00:00
init-script	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
scan	intel-5150.nix: add Intel 5150 wireless firmware support	2012-01-03 14:12:41 +00:00
tools	* Add missing file.	2012-04-10 21:17:43 +00:00