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

* Only run dhclient on interfaces of type 1, otherwise it fails to

Browse Source 
start if the machine has weird network devices (e.g. "eql").

svn path=/nixos/trunk/; revision=19623
This commit is contained in:
Eelco Dolstra 2010-01-22 20:34:32 +00:00
parent 9094ecb546
commit 50430f19e1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/services/networking/dhclient.nix
View File

@ -7,7 +7,7 @@ let
inherit (pkgs) nettools dhcp lib; inherit (pkgs) nettools dhcp lib;
# Don't start dhclient on explicitly configured interfaces. # Don't start dhclient on explicitly configured interfaces.
ignoredInterfaces = ["lo" "wmaster0"] ++ ignoredInterfaces =
map (i: i.name) (lib.filter (i: i ? ipAddress) config.networking.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.
@ -77,9 +77,13 @@ in
interfaces= interfaces=
for i in $(cd /sys/class/net && ls -d *); do 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 # Only run dhclient on interfaces of type ARPHRD_ETHER
echo "Running dhclient on $i" # (1), i.e. Ethernet.
interfaces="$interfaces $i" if [ "$(cat /sys/class/net/$i/type)" = 1 ]; then
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
fi fi
done done