diff options
| author | Lukas Nykryn <lnykryn@redhat.com> | 2015-01-16 14:44:30 +0100 |
|---|---|---|
| committer | Lukas Nykryn <lnykryn@redhat.com> | 2016-05-26 17:13:57 +0200 |
| commit | 21ee08c718692c6a4ff32204767638f0c3aafa65 (patch) | |
| tree | 3c9a076c560340f52206ee1c6c3f307ad6b1a75b | |
| parent | c471fb25f02d2e595995e7c884bbdbfe3b19ef78 (diff) | |
| download | initscripts-21ee08c718692c6a4ff32204767638f0c3aafa65.tar initscripts-21ee08c718692c6a4ff32204767638f0c3aafa65.tar.gz initscripts-21ee08c718692c6a4ff32204767638f0c3aafa65.tar.bz2 initscripts-21ee08c718692c6a4ff32204767638f0c3aafa65.tar.xz initscripts-21ee08c718692c6a4ff32204767638f0c3aafa65.zip | |
ifup-post: check resolve.conf also with DNS2
Cherry-picked from: da08727f3bbcc419096b160968aee83104bb7cf6
Resolves: #1316019
| -rwxr-xr-x | sysconfig/network-scripts/ifup-post | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sysconfig/network-scripts/ifup-post b/sysconfig/network-scripts/ifup-post index 2e93e008..46f49e3a 100755 --- a/sysconfig/network-scripts/ifup-post +++ b/sysconfig/network-scripts/ifup-post @@ -26,7 +26,14 @@ fi if [ "$PEERDNS" != "no" ] ||[ -n "$RESOLV_MODS" -a "$RESOLV_MODS" != "no" ]; then [ -n "$MS_DNS1" ] && DNS1=$MS_DNS1 [ -n "$MS_DNS2" ] && DNS2=$MS_DNS2 - if [ -n "$DNS1" ] && ! grep -q "^nameserver $DNS1" /etc/resolv.conf && + + if [ -z "$DNS1" -a -n "$DNS2" ]; then + DNS1=$DNS2 + DNS2= + fi + + if ( [ -n "$DNS1" ] && ! grep -q "^nameserver $DNS1" /etc/resolv.conf ) || + ( [ -n "$DNS2" ] && ! grep -q "^nameserver $DNS2" /etc/resolv.conf ) && tr=$(mktemp /tmp/XXXXXX) ; then current_replacement="$DNS1" next_replacement="$DNS2" |