Fix previous commit.
svn path=/nixos/trunk/; revision=13229
This commit is contained in:
parent
4a55f02005
commit
b73a579d18
|
@ -31,10 +31,6 @@ let
|
||||||
in
|
in
|
||||||
|
|
||||||
{
|
{
|
||||||
require = [
|
|
||||||
# newtworking
|
|
||||||
(import ../upstart-jobs/dhclient.nix)
|
|
||||||
]
|
|
||||||
|
|
||||||
time = {
|
time = {
|
||||||
|
|
||||||
|
@ -3056,6 +3052,9 @@ root ALL=(ALL) SETENV: ALL
|
||||||
};
|
};
|
||||||
|
|
||||||
require = [
|
require = [
|
||||||
|
# newtworking
|
||||||
|
(import ../upstart-jobs/dhclient.nix)
|
||||||
|
# hardware
|
||||||
(import ../upstart-jobs/pcmcia.nix)
|
(import ../upstart-jobs/pcmcia.nix)
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
{pkgs, config, ...}:
|
{pkgs, config #, ...
|
||||||
|
}:
|
||||||
|
|
||||||
###### interface
|
###### interface
|
||||||
let
|
let
|
||||||
|
@ -48,7 +49,7 @@ let
|
||||||
|
|
||||||
# Don't start dhclient on explicitly configured interfaces.
|
# Don't start dhclient on explicitly configured interfaces.
|
||||||
ignoredInterfaces = ["lo"] ++
|
ignoredInterfaces = ["lo"] ++
|
||||||
map (i: i.name) (lib.filter (i: i ? ipAddress) interfaces);
|
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.
|
stateDir = "/var/lib/dhcp"; # Don't use /var/state/dhcp; not FHS-compliant.
|
||||||
in
|
in
|
||||||
|
@ -60,7 +61,7 @@ in
|
||||||
];
|
];
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
extraJobs = IfEnable [{
|
extraJobs = ifEnable [{
|
||||||
name = "dhclient";
|
name = "dhclient";
|
||||||
|
|
||||||
extraPath = [dhcp];
|
extraPath = [dhcp];
|
||||||
|
|
Loading…
Reference in a new issue