Eelco Dolstra 44d091674b Merge branch 'master' of github.com:NixOS/nixos into systemd ... Conflicts: modules/config/networking.nix modules/services/networking/ssh/sshd.nix modules/services/ttys/agetty.nix modules/system/boot/stage-2-init.sh modules/system/upstart-events/shutdown.nix		2012-07-16 17:27:11 -04:00
..
config	Merge branch 'master' of github.com:NixOS/nixos into systemd	2012-07-16 17:27:11 -04:00
hardware	Add module for b43 firmware	2012-07-13 23:54:41 -04:00
installer	Global replace /var/run/current-system -> /run/current-system	2012-07-16 11:34:21 -04:00
misc	Global replace /var/run/current-system -> /run/current-system	2012-07-16 11:34:21 -04:00
profiles	* On headless systems, disable the emergency shell and redirect	2012-05-16 15:08:44 +00:00
programs	Global replace /var/run/current-system -> /run/current-system	2012-07-16 11:34:21 -04:00
security	Use pam_systemd.so to set up device ownership	2012-06-15 14:51:48 -04:00
services	Merge branch 'master' of github.com:NixOS/nixos into systemd	2012-07-16 17:27:11 -04:00
system	Merge branch 'master' of github.com:NixOS/nixos into systemd	2012-07-16 17:27:11 -04:00
tasks	Merge branch 'master' of github.com:NixOS/nixos into systemd	2012-07-16 17:27:11 -04:00
testing	Merge branch 'master' of github.com:NixOS/nixos into systemd	2012-06-22 18:20:26 -04:00
virtualisation	Fix booting on EC2	2012-06-24 19:02:34 -04:00
module-list.nix	Merge branch 'master' of github.com:NixOS/nixos into systemd	2012-07-16 17:27:11 -04:00
rename.nix	* wpa_supplicant: automatically figure out the wireless interface(s)	2012-03-04 17:21:14 +00:00