nixos/initrd-network: multiple fixes
* acquire DHCP on the interfaces with networking.interface.$name.useDHCP == true or on all interfaces if networking.useDHCP == true (was only only "eth0") * respect "mtu" if it was in DHCP answer (it happens in the wild) * acquire and set up staticroutes (unlike others clients, udhcpc does not do the query by default); this supersedes https://github.com/NixOS/nixpkgs/pull/41829
This commit is contained in:
parent
857bf71655
commit
502b37ae63
@ -6,11 +6,23 @@ 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"
|
if [ -n "$mtu" ]; then
|
||||||
|
ip address add "$ip/$mask" dev "$interface" mtu "$mtu"
|
||||||
|
else
|
||||||
|
ip address add "$ip/$mask" 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 default via "$router" dev "$interface"
|
ip route add default via "$router" dev "$interface"
|
||||||
fi
|
fi
|
||||||
@ -92,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
|
||||||
''
|
''
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user