diff options
| author | Lukas Nykryn <lnykryn@redhat.com> | 2015-01-16 14:44:30 +0100 |
|---|---|---|
| committer | Lukas Nykryn <lnykryn@redhat.com> | 2015-10-27 13:33:23 +0100 |
| commit | 2a31b3e2d30f6478896553b866cf790463b4144e (patch) | |
| tree | 195c3f4b46036ea310b2322531218050255c6a1b /sysconfig | |
| parent | e00a9a9fa9d911d4a2fd266f8298387807fe1c11 (diff) | |
| download | initscripts-2a31b3e2d30f6478896553b866cf790463b4144e.tar initscripts-2a31b3e2d30f6478896553b866cf790463b4144e.tar.gz initscripts-2a31b3e2d30f6478896553b866cf790463b4144e.tar.bz2 initscripts-2a31b3e2d30f6478896553b866cf790463b4144e.tar.xz initscripts-2a31b3e2d30f6478896553b866cf790463b4144e.zip | |
ifup-post: check resolve.conf also with DNS2
Resolves: #1115573
Diffstat (limited to 'sysconfig')
| -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 29af56b7..5e9aa4d0 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" |