aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Kaspar [Dee'Kej] <dkaspar@redhat.com>2018-08-20 14:31:56 +0200
committerLukáš Nykrýn <lnykryn@redhat.com>2019-06-06 10:32:53 +0200
commit1d4ffa5559de4cf3fdfcc2e69467fc74426cd78c (patch)
treeb6cb2fdd2cd704b62c673bab521522789e30da76
parentb163b3a66dc3684181f219f424e2dd81eff691f6 (diff)
downloadinitscripts-1d4ffa5559de4cf3fdfcc2e69467fc74426cd78c.tar
initscripts-1d4ffa5559de4cf3fdfcc2e69467fc74426cd78c.tar.gz
initscripts-1d4ffa5559de4cf3fdfcc2e69467fc74426cd78c.tar.bz2
initscripts-1d4ffa5559de4cf3fdfcc2e69467fc74426cd78c.tar.xz
initscripts-1d4ffa5559de4cf3fdfcc2e69467fc74426cd78c.zip
ifup-post: fix incorrect condition for RESOLV_MODS
This was causing the /etc/resolv.conf file to be always updated when RESOLV_MODS was not set... Before the commit 5d6156454bf8f6dab4a5fdd7e1bf6 we were not updating the /etc/resolv.conf file if the RESOLV_MODS was empty. See https://bugzilla.redhat.com/show_bug.cgi?id=1610411 for more info.
-rwxr-xr-xnetwork-scripts/ifup-post2
1 files changed, 1 insertions, 1 deletions
diff --git a/network-scripts/ifup-post b/network-scripts/ifup-post
index 5a89cbf3..4cb986f8 100755
--- a/network-scripts/ifup-post
+++ b/network-scripts/ifup-post
@@ -28,7 +28,7 @@ if ! is_true "$NOROUTESET"; then
fi
-if ! is_false "${PEERDNS}" || ! is_false "${RESOLV_MODS}"; then
+if ! is_false "${PEERDNS}" || is_true "${RESOLV_MODS}"; then
# Obtain the DNS entries when using PPP if necessary:
[ -n "${MS_DNS1}" ] && DNS1="${MS_DNS1}"
[ -n "${MS_DNS2}" ] && DNS2="${MS_DNS2}"