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

Made a small fix because I kept receiving errors about: diff command not found. It also makes my system horribly slow.

Browse Source 
svn path=/nixos/trunk/; revision=19148
This commit is contained in:
Sander van der Burg 2009-12-29 21:23:22 +00:00
parent 4cf78fdb77
commit df21f0f06d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/tasks/swraid.nix
View File

@ -7,7 +7,7 @@ let
tempConf = "/var/run/mdadm.conf"; tempConf = "/var/run/mdadm.conf";
logFile = "/var/log/mdadmEvents.log"; logFile = "/var/log/mdadmEvents.log";
modprobe = config.system.sbin.modprobe; modprobe = config.system.sbin.modprobe;
inherit (pkgs) mdadm; inherit (pkgs) mdadm diffutils;
mdadmEventHandler = pkgs.writeScript "mdadmEventHandler.sh" '' mdadmEventHandler = pkgs.writeScript "mdadmEventHandler.sh" ''
#!/bin/sh #!/bin/sh
@ -42,7 +42,7 @@ in
# Scan /proc/partitions for RAID devices. # Scan /proc/partitions for RAID devices.
${mdadm}/sbin/mdadm --examine --brief --scan -c partitions > ${tempConf} ${mdadm}/sbin/mdadm --examine --brief --scan -c partitions > ${tempConf}
if ! diff ${tempConf} ${tempConf}.old > /dev/null; then if ! ${diffutils}/bin/diff ${tempConf} ${tempConf}.old > /dev/null; then
# Activate each device found. # Activate each device found.
${mdadm}/sbin/mdadm --assemble -c ${tempConf} --scan ${mdadm}/sbin/mdadm --assemble -c ${tempConf} --scan