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
..
kernel.nix	* Set boot.vesa to false if we don't have a fbcondecor-enabled kernel.	2011-12-08 12:25:33 +00:00
luksroot.nix	Revert "test we have cryptsetup-1.4.1 in initrd"	2011-12-28 22:37:38 +00:00
modprobe.nix	* modprobe wants /etc/modprobe.d now.	2011-11-01 15:39:30 +00:00
stage-1-init.sh	add preLVMCommands hook	2011-12-28 21:46:45 +00:00
stage-1.nix	switched all mergeOptionString to pkgs.lib.types.string	2011-12-29 00:51:35 +00:00
stage-2-init.sh	* Remove references to the "safemode" boot option, which doesn't do	2011-11-03 00:46:29 +00:00
stage-2.nix	switched all mergeOptionString to pkgs.lib.types.string	2011-12-29 00:51:35 +00:00