* Move the dhclient exit hooks file to the dhclient module, where it

belongs.

svn path=/nixos/branches/modular-nixos/; revision=15755
This commit is contained in:
Eelco Dolstra 2009-05-27 23:30:29 +00:00
parent 3c6ae39a0d
commit 05a08adf91
4 changed files with 62 additions and 58 deletions

View file

@ -109,14 +109,6 @@ let
target = "default/useradd";
}
{ # Dhclient hooks for emitting ip-up/ip-down events.
source = pkgs.substituteAll {
src = ./dhclient-exit-hooks;
inherit (pkgs) upstart glibc;
};
target = "dhclient-exit-hooks";
}
{ # Script executed when the shell starts as a non-login shell (system-wide version).
source = pkgs.substituteAll {
src = ./bashrc.sh;
@ -140,7 +132,7 @@ let
{ # Script executed when the shell starts as a non-login shell (user version).
source = ./skel/bashrc;
target = "skel/.bashrc";
}
}
{ # SSH configuration. Slight duplication of the sshd_config
# generation in the sshd service.

View file

@ -1,11 +0,0 @@
echo "$reason" >> /tmp/dhcp-exit
echo "$exit_status" >> /tmp/dhcp-exit
if test "$reason" = BOUND -o "$reason" = REBOOT; then
@glibc@/sbin/nscd --invalidate hosts
@upstart@/sbin/initctl emit ip-up
fi
if test "$reason" = EXPIRE -o "$reason" = RELEASE; then
@upstart@/sbin/initctl emit ip-down
fi

View file

@ -38,6 +38,7 @@ in
###### implementation
let
ifEnable = arg:
if config.networking.useDHCP then arg
else if builtins.isList arg then []
@ -51,6 +52,22 @@ let
map (i: i.name) (lib.filter (i: i ? ipAddress) config.networking.interfaces);
stateDir = "/var/lib/dhcp"; # Don't use /var/state/dhcp; not FHS-compliant.
dhclientExitHooks = pkgs.writeText "dhclient-exit-hooks"
''
echo "$reason" >> /tmp/dhcp-exit
echo "$exit_status" >> /tmp/dhcp-exit
if test "$reason" = BOUND -o "$reason" = REBOOT; then
${pkgs.glibc}/sbin/nscd --invalidate hosts
${pkgs.upstart}/sbin/initctl emit ip-up
fi
if test "$reason" = EXPIRE -o "$reason" = RELEASE; then
${pkgs.upstart}/sbin/initctl emit ip-down
fi
'';
in
{
@ -59,44 +76,50 @@ in
options
];
services = {
extraJobs = ifEnable [{
name = "dhclient";
services.extraJobs = ifEnable [{
name = "dhclient";
extraPath = [dhcp];
extraPath = [dhcp];
job = ''
description "DHCP client"
start on network-interfaces/started
stop on network-interfaces/stop
env PATH_DHCLIENT_SCRIPT=${dhcp}/sbin/dhclient-script
script
export PATH=${nettools}/sbin:$PATH
# Determine the interface on which to start dhclient.
interfaces=
for i in $(cd /sys/class/net && ls -d *); do
if ! for j in ${toString ignoredInterfaces}; do echo $j; done | grep -F -x -q "$i"; then
echo "Running dhclient on $i"
interfaces="$interfaces $i"
fi
done
if test -z "$interfaces"; then
echo 'No interfaces on which to start dhclient!'
exit 1
fi
mkdir -m 755 -p ${stateDir}
exec ${dhcp}/sbin/dhclient -d $interfaces -e "PATH=$PATH" -lf ${stateDir}/dhclient.leases
end script
'';
}];
environment.etc = ifEnable
[ # Dhclient hooks for emitting ip-up/ip-down events.
{ source = dhclientExitHooks;
target = "dhclient-exit-hooks";
}
];
job = "
description \"DHCP client\"
start on network-interfaces/started
stop on network-interfaces/stop
env PATH_DHCLIENT_SCRIPT=${dhcp}/sbin/dhclient-script
script
export PATH=${nettools}/sbin:$PATH
# Determine the interface on which to start dhclient.
interfaces=
for i in $(cd /sys/class/net && ls -d *); do
if ! for j in ${toString ignoredInterfaces}; do echo $j; done | grep -F -x -q \"$i\"; then
echo \"Running dhclient on $i\"
interfaces=\"$interfaces $i\"
fi
done
if test -z \"$interfaces\"; then
echo 'No interfaces on which to start dhclient!'
exit 1
fi
mkdir -m 755 -p ${stateDir}
exec ${dhcp}/sbin/dhclient -d $interfaces -e \"PATH=$PATH\" -lf ${stateDir}/dhclient.leases
end script
";
}];
};
}

View file

@ -80,7 +80,7 @@ let
echo Duplicate entry: $i;
fi;
done
'';
''; # */
in