BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* dhcpcd: restart ntpd and emit ip-up/ip-down events. Also attach the

Browse source 
interface name to the events, as suggested by Mathijs Kwik.

svn path=/nixos/trunk/; revision=32430
This commit is contained in:
Eelco Dolstra 2012-02-20 15:19:46 +00:00
parent a46fd58b3d
commit 4e9c8d0b9d
1 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
modules/services/networking/dhcpcd.nix
View file

@ -35,6 +35,29 @@ let
denyinterfaces ${toString ignoredInterfaces} peth* vif* tap* virbr* vnet*
'';
# Hook for emitting ip-up/ip-down events.
exitHook = pkgs.writeText "dhcpcd.exit-hook"
''
#exec >> /var/log/dhcpcd 2>&1
#set -x
if [ "$reason" = BOUND -o "$reason" = REBOOT ]; then
# Restart ntpd. (The "ip-up" event below will trigger the
# restart.) We need to restart it to make sure that it will
# actually do something: if ntpd cannot resolve the server
# hostnames in its config file, then it will never do
# anything ever again ("couldn't resolve ..., giving up on
# it"), so we silently lose time synchronisation.
${config.system.build.upstart}/sbin/initctl stop ntpd
${config.system.build.upstart}/sbin/initctl emit -n ip-up IFACE=$interface
fi
if [ "$reason" = EXPIRE -o "$reason" = RELEASE ]; then
${config.system.build.upstart}/sbin/initctl emit -n ip-down IFACE=$interface
fi
'';
in
{
@ -49,13 +72,17 @@ in
path = [ dhcpcd pkgs.nettools pkgs.openresolv ];
exec = "dhcpcd --config ${dhcpcdConf} --background --persistent";
daemonType = "daemon";
exec = "dhcpcd --config ${dhcpcdConf} --nobackground --persistent";
};
environment.systemPackages = [ dhcpcd ];
environment.etc =
[ { source = exitHook;
target = "dhcpcd.exit-hook";
}
];
powerManagement.resumeCommands =
''
${config.system.build.upstart}/sbin/restart dhcpcd