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
..
installation-cd-base.nix	Reverting 33692, because memtest in the iso was failing.	2012-04-10 21:18:48 +00:00
installation-cd-efi.nix	installation-cd-efi: Only build a minimal cd	2012-03-16 11:25:09 +00:00
installation-cd-graphical.nix	* Disable wicd in the installation CD for now, because it causes	2012-04-10 13:09:56 +00:00
installation-cd-minimal.nix	* My grep skills are lacking.	2011-11-08 16:39:13 +00:00
installation-cd-new-kernel.nix	Restore old installation-cd-new-kernel.nix and create a new installation-cd-efi.nix	2012-03-16 11:22:05 +00:00
iso-image.nix	Whoops	2012-03-19 17:25:50 +00:00
live-dvd.nix	strip trailing whitespace; no functional change	2011-09-14 18:20:50 +00:00
memtest.nix	Reverting 33692, because memtest in the iso was failing.	2012-04-10 21:18:48 +00:00
system-tarball-fuloong2f.nix	* Add a command "nixos-version" that prints the version of the	2012-04-10 20:56:38 +00:00
system-tarball-pc.nix	Making also the system-tarball-pc show the memtest entry as the	2012-04-09 20:37:54 +00:00
system-tarball-sheevaplug.nix	* Add a command "nixos-version" that prints the version of the	2012-04-10 20:56:38 +00:00
system-tarball.nix	Reverting revisions 30103-30106: "always set nixpkgs.config.{state,store}Dir", etc.	2011-10-30 15:19:58 +00:00