You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
48 lines
2.0 KiB
48 lines
2.0 KiB
6 years ago
|
From aa5313ca0e17bb08dd0629c3f9385672408caceb Mon Sep 17 00:00:00 2001
|
||
|
|
From: Will Woods <wwoods@redhat.com>
|
||
|
|
Date: Thu, 28 Aug 2014 13:44:47 -0400
|
||
|
|
Subject: [PATCH] do 'ip route replace default' instead of 'add'
|
||
|
|
|
||
|
|
When you define the gateway for an interface, dracut sets it up with:
|
||
|
|
|
||
|
|
ip route add default via $gw dev $netif
|
||
|
|
|
||
|
|
If a default route is already set (e.g. if you have multiple NICs), this
|
||
|
|
will fail with the message "RTNETLINK answers: File exists".
|
||
|
|
|
||
|
|
So, if your first NIC isn't usable as a default route
|
||
|
|
|
||
|
|
Using "ip route replace default" instead allows ifup/dhclient-script to
|
||
|
|
correctly change the default route to the new interface.
|
||
|
|
---
|
||
|
|
modules.d/40network/dhclient-script.sh | 2 +-
|
||
|
|
modules.d/40network/ifup.sh | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh
|
||
|
|
index ba05250d..885303a2 100755
|
||
|
|
--- a/modules.d/40network/dhclient-script.sh
|
||
|
|
+++ b/modules.d/40network/dhclient-script.sh
|
||
|
|
@@ -45,7 +45,7 @@ setup_interface() {
|
||
|
|
valid_lft ${lease_time} preferred_lft ${lease_time} \
|
||
|
|
dev $netif
|
||
|
|
|
||
|
|
- [ -n "$gw" ] && echo ip route add default via $gw dev $netif > /tmp/net.$netif.gw
|
||
|
|
+ [ -n "$gw" ] && echo ip route replace default via $gw dev $netif > /tmp/net.$netif.gw
|
||
|
|
|
||
|
|
[ -n "${search}${domain}" ] && echo "search $search $domain" > /tmp/net.$netif.resolv.conf
|
||
|
|
if [ -n "$namesrv" ] ; then
|
||
|
|
diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
|
||
|
|
index 43e84a2c..67b1d9f8 100755
|
||
|
|
--- a/modules.d/40network/ifup.sh
|
||
|
|
+++ b/modules.d/40network/ifup.sh
|
||
|
|
@@ -145,7 +145,7 @@ do_static() {
|
||
|
|
ip addr add $ip/$mask ${srv:+peer $srv} brd + dev $netif
|
||
|
|
fi
|
||
|
|
|
||
|
|
- [ -n "$gw" ] && echo ip route add default via $gw dev $netif > /tmp/net.$netif.gw
|
||
|
|
+ [ -n "$gw" ] && echo ip route replace default via $gw dev $netif > /tmp/net.$netif.gw
|
||
|
|
[ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
|
||
|
|
|
||
|
|
return 0
|