dhclient: not always skip the nfsroot interface
PATCH 1/2 dhclient: not always skip the nfsroot interface
From: Mingli Yu <[email protected]>
Don't skip the nfsroot interface when use dhcp
to get the address for nfsroot interface as the
nfsroot interface may need dhclient to renew
the lease.
Signed-off-by Mingli Yu <[email protected]>
--- .../dhcp/files/dhclient-systemd-wrapper | 26 +++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)
meta/recipes-connectivity/dhcp/files/dhclient-systemd-wrapper +25 -1
@@ -1,5 +1,19 @@ #!/bin/sh +# Add an initial /var/lib/dhcp/dhclient.leases to make +# sure the IP which dhclient try to renew is the same +# with the IP which kernel got from dhcp server during +# boot +update_dhclient_leases() +{ + local addr=$1 + local interface=$2 + echo "lease {" >> /var/lib/dhcp/dhclient.leases + echo " interface \"${addr}\";" >> /var/lib/dhcp/dhclient.leases + echo " fixed-address ${interface:0:-3};" >> /var/lib/dhcp/dhclient.leases + echo "}" >> /var/lib/dhcp/dhclient.leases +} + # In case the interface is used for nfs, skip it. nfsroot=0 interfaces=""
@@ -19,6 +33,7 @@ while read dev mtpt fstype rest; do done exec 0<&9 9<&- + if [ $nfsroot -eq 0 ]; then interfaces="$INTERFACES" else
@@ -27,7 +42,16 @@ else fi for i in $INTERFACES; do if test "x$i" = "x$nfs_iface"; then - echo "dhclient skipping nfsroot interface $i" + interface_addr=`ip -4 address show $nfs_iface | grep 'inet '|sed 's/.*inet \(\S\+\).*/\1/'` + if [ "x$interface_addr" != "x" ] && cat /proc/cmdline | grep "ip=dhcp" > /dev/null ; then + # use to renew lease if needed + interfaces="$interfaces $i" + # use to update /var/lib/dhcp/dhclient.leases if needed + # when the ip got by kernel, we need use dhclient to renew the ip + update_dhclient_leases $nfs_iface $interface_addr + else + echo "dhclient skipping nfsroot interface $i" + fi else interfaces="$interfaces $i" fi
Signature · 1 line
2.7.4
PATCH 2/2 dhcp: add RDEPENDS for dhcp-client
From: Mingli Yu <[email protected]>
Add iproute2 RDEPENDS for dhcp-client as/sbin/dhclient-systemd-wrapper which called
by dhclient.service depends on ip command which
provided by iproute2 package when systemd enabled
in DISTRO_FEATURES.
Signed-off-by Mingli Yu <[email protected]>
--- meta/recipes-connectivity/dhcp/dhcp.inc | 1 + 1 file changed, 1 insertion(+)
meta/recipes-connectivity/dhcp/dhcp.inc +1 -0
@@ -100,6 +100,7 @@ do_install_append () { PACKAGES += "dhcp-libs dhcp-server dhcp-server-config dhcp-client dhcp-relay dhcp-omshell" PACKAGES_remove = "${PN}" +RDEPENDS_${PN}-client += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'iproute2', '', d)}" RDEPENDS_${PN}-dev = "" RDEPENDS_${PN}-staticdev = "" FILES_${PN}-libs = "${libdir}/libdhcpctl.so.0* ${libdir}/libomapi.so.0* ${libdir}/libdhcp.so.0*"
Signature · 1 line
2.7.4