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

Merge pull request #46459 from volth/volth-patch-3

Browse Source 
nixos/initrd-network: multiple DHCP fixes
This commit is contained in:
Matthew Bauer 2018-10-05 22:47:45 -05:00 committed by GitHub
commit 357d32e2b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
nixos/modules/system/boot/initrd-network.nix
View File

@ -6,11 +6,22 @@ let
cfg = config.boot.initrd.network; cfg = config.boot.initrd.network;
dhcpinterfaces = lib.attrNames (lib.filterAttrs (iface: v: v.useDHCP == true) (config.networking.interfaces or {}));
udhcpcScript = pkgs.writeScript "udhcp-script" udhcpcScript = pkgs.writeScript "udhcp-script"
'' ''
#! /bin/sh #! /bin/sh
if [ "$1" = bound ]; then if [ "$1" = bound ]; then
ip address add "$ip/$mask" dev "$interface" ip address add "$ip/$mask" dev "$interface"
if [ -n "$mtu" ]; then
ip link set mtu "$mtu" dev "$interface"
fi
if [ -n "$staticroutes" ]; then
echo "$staticroutes" \
| sed -r "s@(\S+) (\S+)@ ip route add \"\1\" via \"\2\" dev \"$interface\" ; @g" \
| sed -r "s@ via \"0\.0\.0\.0\"@@g" \
| /bin/sh
fi
if [ -n "$router" ]; then if [ -n "$router" ]; then
ip route add "$router" dev "$interface" # just in case if "$router" is not within "$ip/$mask" (e.g. Hetzner Cloud) ip route add "$router" dev "$interface" # just in case if "$router" is not within "$ip/$mask" (e.g. Hetzner Cloud)
ip route add default via "$router" dev "$interface" ip route add default via "$router" dev "$interface"
@ -93,18 +104,24 @@ in
'' ''
# Otherwise, use DHCP. # Otherwise, use DHCP.
+ optionalString config.networking.useDHCP '' + optionalString (config.networking.useDHCP || dhcpinterfaces != []) ''
if [ -z "$hasNetwork" ]; then if [ -z "$hasNetwork" ]; then
# Bring up all interfaces. # Bring up all interfaces.
for iface in $(cd /sys/class/net && ls); do for iface in $(ls /sys/class/net/); do
echo "bringing up network interface $iface..." echo "bringing up network interface $iface..."
ip link set "$iface" up ip link set "$iface" up
done done
# Acquire a DHCP lease. # Acquire DHCP leases.
echo "acquiring IP address via DHCP..." for iface in ${ if config.networking.useDHCP then
udhcpc --quit --now --script ${udhcpcScript} ${udhcpcArgs} && hasNetwork=1 "$(ls /sys/class/net/ | grep -v ^lo$)"
else
lib.concatMapStringsSep " " lib.escapeShellArg dhcpinterfaces
}; do
echo "acquiring IP address via DHCP on $iface..."
udhcpc --quit --now -i $iface -O staticroutes --script ${udhcpcScript} ${udhcpcArgs} && hasNetwork=1
done
fi fi
'' ''