Michael Raskin 94205f5f21 Revert "Merge pull request #2449 from wkennington/master.grub" ... This reverts commit 469f22d717, reversing changes made to 0078bc5d8f. Conflicts: nixos/modules/installer/tools/nixos-generate-config.pl nixos/modules/system/boot/loader/grub/install-grub.pl nixos/release.nix nixos/tests/installer.nix I tried to keep apparently-safe code in conflicts.		2014-08-31 12:58:37 +04:00
..
loader	Revert "Merge pull request #2449 from wkennington/master.grub"	2014-08-31 12:58:37 +04:00
emergency-mode.nix	nixos: tmp on tmpfs option	2014-07-30 16:19:26 +02:00
kernel.nix	initrd.availableKernelModules: add support for keyboards	2014-08-12 20:00:01 +02:00
kexec.nix	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00
luksroot.nix	Remove useless use of optionSet.	2014-08-29 18:43:03 +02:00
modprobe.nix	modprobe.nix: Use modern environment.etc syntax	2014-07-31 22:09:51 +02:00
pbkdf2-sha512.c	Update to the Yubikey PBA	2014-02-08 14:59:52 +01:00
readonly-mountpoint.c	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00
shutdown.nix	Don't run hwclock if /dev/rtc doesn't exist	2014-05-05 16:47:51 +02:00
stage-1-init.sh	nixos/stage-1: Don't check resilient filesystems	2014-08-05 21:06:51 +02:00
stage-1.nix	nixos: Remove modprobe.d/nixos.conf from initrd.	2014-08-24 18:19:56 +02:00
stage-2-init.sh	Containers: Don't remount /	2014-08-18 17:14:43 +02:00
stage-2.nix	nixos: tmp on tmpfs option	2014-07-30 16:19:26 +02:00
systemd-unit-options.nix	Refactor unit option declarations	2014-04-17 23:35:05 +02:00
systemd.nix	Don't barf if /var/log doesn't support ACLs	2014-08-18 14:21:45 +02:00
tmp.nix	nixos: tmp on tmpfs option	2014-07-30 16:19:26 +02:00