Author: eelco
Date: Mon Jul 12 16:07:26 2010
New Revision: 22564
URL: https://svn.nixos.org/websvn/nix/?rev=22564&sc=1
Log:
* On an `ip-up' event, notify mountall so that it retries mounting
remote filesystems.
Modified:
nixos/trunk/modules/tasks/filesystems.nix
Modified: nixos/trunk/modules/tasks/filesystems.nix
==============================================================================
--- nixos/trunk/modules/tasks/filesystems.nix Mon Jul 12 15:32:23 2010
(r22563)
+++ nixos/trunk/modules/tasks/filesystems.nix Mon Jul 12 16:07:26 2010
(r22564)
@@ -170,6 +170,7 @@
exec > /dev/console 2>&1
echo "mounting filesystems..."
export PATH=${config.system.sbin.mount}/bin:${makeSearchPath
"sbin" ([pkgs.utillinux] ++ fsPackages)}:$PATH
+ mv /etc/hosts /etc/hosts_
${pkgs.mountall}/sbin/mountall
'';
};
@@ -177,7 +178,7 @@
# The `mount-failed' event is emitted synchronously, but we don't
# want `mountall' to wait for the emergency shell. So use this
# intermediate job to make the event asynchronous.
- jobs.mountFailed =
+ jobs.mount_failed =
{ name = "mount-failed";
task = true;
startOn = "mount-failed";
@@ -189,7 +190,20 @@
'';
};
- jobs.emergencyShell =
+ # On an `ip-up' event, notify mountall so that it retries mounting
+ # remote filesystems.
+ jobs.mountall_ip_up =
+ {
+ name = "mountall-ip-up";
+ task = true;
+ startOn = "ip-up";
+ script =
+ ''
+ ${pkgs.procps}/bin/pkill -USR1 -u root mountall || true
+ '';
+ };
+
+ jobs.emergency_shell =
{ name = "emergency-shell";
task = true;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
