]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
network/dhclient-script: also parse dot separated $new_classless_static_routes 242/head
authorLukas Nykryn <lnykryn@redhat.com>
Mon, 26 Jun 2017 08:12:46 +0000 (10:12 +0200)
committerLukas Nykryn <lnykryn@redhat.com>
Mon, 26 Jun 2017 08:12:46 +0000 (10:12 +0200)
Previously our dhclient-script expected that $new_classless_static_routes
will have all values separated by a whitespace. But at least on F25
dhclient will put there the destination descriptor in the same format
as it is used by ISC dhcp-server.
For example:
new_classless_static_routes=32.10.198.122.47 192.168.78.4
while our current code expects
new_classless_static_routes=32 10 198 122 47 192 168 78 4

So let's just accept both of these formats by adding "." to IFS.

For details plesse see https://tools.ietf.org/html/rfc3442
"Classless Route Option Format"

modules.d/40network/dhclient-script.sh

index 0332a76c48680d91983a3e46d4b59a1ab9ab0cc9..fc6ed0a36110bb69ef9e5beb9d4b5ff31a209fa8 100755 (executable)
@@ -191,7 +191,10 @@ case $reason in
             echo '. /lib/net-lib.sh'
             echo "setup_net $netif"
             if [ -n "$new_classless_static_routes" ]; then
+                OLDIFS="$IFS"
+                IFS=".$IFS"
                 parse_option_121 $new_classless_static_routes
+                IFS="$OLDIFS"
             fi
             echo "source_hook initqueue/online $netif"
             [ -e /tmp/net.$netif.manualup ] || echo "/sbin/netroot $netif"