public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:NixOS/nixos into systemd

Browse Source 
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
This commit is contained in:
Eelco Dolstra
2012-07-16 17:27:11 -04:00
parent bf15293b1e 1d57489427
commit 44d091674b
38 changed files with 544 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/services/monitoring/systemhealth.nix
View File

@@ -86,8 +86,8 @@ in
[paths]
rrdtool = ${pkgs.rrdtool}/bin/rrdtool
loadavg_rrd = loadavg
ps = /var/run/current-system/sw/bin/ps
df = /var/run/current-system/sw/bin/df
ps = /run/current-system/sw/bin/ps
df = /run/current-system/sw/bin/df
meminfo_rrd = meminfo
uptime_rrd = uptime
rrd_path = ${rrdDir}