|
 |
712866 |
From 968c66b609f1e894d7522d622ddc95d14d49d66d Mon Sep 17 00:00:00 2001
|
|
|
712866 |
From: Harald Hoyer <harald@redhat.com>
|
|
|
712866 |
Date: Thu, 28 May 2015 19:44:55 +0200
|
|
|
712866 |
Subject: [PATCH] network: setup gateway after setting up resolv.conf
|
|
|
712866 |
|
|
|
712866 |
If a daemon listens for route changes and wants to use the interface
|
|
|
712866 |
afterwards, it should be able to resolve DNS
|
|
|
712866 |
|
|
|
712866 |
(cherry picked from commit 0b7bfacfeaf86c4001dc2ea46cecdc65c9cdfff1)
|
|
|
712866 |
---
|
|
|
712866 |
modules.d/40network/net-lib.sh | 2 +-
|
|
|
712866 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
712866 |
|
|
|
712866 |
diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
|
|
|
5c6c2a |
index de5273ca..cfc06feb 100755
|
|
|
712866 |
--- a/modules.d/40network/net-lib.sh
|
|
|
712866 |
+++ b/modules.d/40network/net-lib.sh
|
|
|
712866 |
@@ -96,13 +96,13 @@ setup_net() {
|
|
|
712866 |
[ -e "/tmp/net.ifaces" ] && read IFACES < /tmp/net.ifaces
|
|
|
712866 |
[ -z "$IFACES" ] && IFACES="$netif"
|
|
|
712866 |
# run the scripts written by ifup
|
|
|
712866 |
- [ -e /tmp/net.$netif.gw ] && . /tmp/net.$netif.gw
|
|
|
712866 |
[ -e /tmp/net.$netif.hostname ] && . /tmp/net.$netif.hostname
|
|
|
712866 |
[ -e /tmp/net.$netif.override ] && . /tmp/net.$netif.override
|
|
|
712866 |
[ -e /tmp/dhclient.$netif.dhcpopts ] && . /tmp/dhclient.$netif.dhcpopts
|
|
|
712866 |
# set up resolv.conf
|
|
|
712866 |
[ -e /tmp/net.$netif.resolv.conf ] && \
|
|
|
712866 |
cp -f /tmp/net.$netif.resolv.conf /etc/resolv.conf
|
|
|
712866 |
+ [ -e /tmp/net.$netif.gw ] && . /tmp/net.$netif.gw
|
|
|
712866 |
|
|
|
712866 |
# add static route
|
|
|
712866 |
for _p in $(getargs rd.route); do
|