diff options
| author | David Kaspar [Dee'Kej] <dkaspar@redhat.com> | 2017-10-30 17:08:42 +0100 |
|---|---|---|
| committer | Dee'Kej <deekej@linuxmail.org> | 2017-10-31 13:11:59 +0100 |
| commit | 5d6156454bf8f6dab4a5fdd7e1bf6cdc72c09456 (patch) | |
| tree | c9a61b6f7fc553ada018d1bf13dd7b4a2cc3c467 /sysconfig/network-scripts/ifdown-post | |
| parent | 9e48c7ad6fae91a333d0b0a39cffee14a3130f2c (diff) | |
| download | initscripts-5d6156454bf8f6dab4a5fdd7e1bf6cdc72c09456.tar initscripts-5d6156454bf8f6dab4a5fdd7e1bf6cdc72c09456.tar.gz initscripts-5d6156454bf8f6dab4a5fdd7e1bf6cdc72c09456.tar.bz2 initscripts-5d6156454bf8f6dab4a5fdd7e1bf6cdc72c09456.tar.xz initscripts-5d6156454bf8f6dab4a5fdd7e1bf6cdc72c09456.zip | |
ifup-post: always update nameserver & search entries in /etc/resolv.conf
This is complete rework of how we generate the /etc/resolv.conf.
Fixes:
* always update 'nameserver' & 'search' entries when DNS* & DOMAIN
options (respectively) were updated in ifcfg-* files
* always update the order of 'nameserver' entries when the order of
DNS* options was updated
* always keep /etc/resolv.conf.save as a proper backup - do not
overwrite it everytime when updating 'nameserver' or 'search'
Enhancements:
* added support for DNS3 option (equals to MAXNS value in GLIBC)
* added logic to process duplicate DNS* options
* added logic to process randomly omitted DNS* options (e.g. omitting
DNS1 while specifying DNS2 and/or DNS3 will still work now)
This work was based on these two RHEL-7.5 BZs:
https://bugzilla.redhat.com/show_bug.cgi?id=1364895
https://bugzilla.redhat.com/show_bug.cgi?id=1357658
Diffstat (limited to 'sysconfig/network-scripts/ifdown-post')
| -rwxr-xr-x | sysconfig/network-scripts/ifdown-post | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/sysconfig/network-scripts/ifdown-post b/sysconfig/network-scripts/ifdown-post index 426dae3e..229c9877 100755 --- a/sysconfig/network-scripts/ifdown-post +++ b/sysconfig/network-scripts/ifdown-post @@ -18,35 +18,39 @@ source_config /etc/sysconfig/network-scripts/ifdown-routes ${REALDEVICE} ${DEVNAME} -if [ "$PEERDNS" != "no" -o -n "$RESOLV_MODS" -a "$RESOLV_MODS" != "no" ] && \ +# Remove duplicate DNS entries and shift them, +# to have always correct condition below... +update_DNS_entries + +if ! is_false "${PEERDNS}" || ! is_false "${RESOLV_MODS}" && \ [ "${DEVICETYPE}" = "ppp" -o "${DEVICETYPE}" = "ippp" -o -n "${DNS1}" \ -o "${BOOTPROTO}" = "bootp" -o "${BOOTPROTO}" = "dhcp" ] ; then -if [ -f /etc/resolv.conf.save ]; then - change_resolv_conf /etc/resolv.conf.save - rm -f /etc/resolv.conf.save -fi -if [ "${DEVICETYPE}" = "ppp" -o "${DEVICETYPE}" = "ippp" ]; then - if [ -f /etc/ppp/peers/$DEVICE ] ; then - rm -f /etc/ppp/peers/$DEVICE + if [ -f /etc/resolv.conf.save ]; then + change_resolv_conf /etc/resolv.conf.save + rm -f /etc/resolv.conf.save + fi + if [ "${DEVICETYPE}" = "ppp" -o "${DEVICETYPE}" = "ippp" ]; then + if [ -f /etc/ppp/peers/$DEVICE ] ; then + rm -f /etc/ppp/peers/$DEVICE + fi fi -fi fi # Reset the default route if this interface had a special one if ! check_default_route ; then # ISDN device needs special handling dial on demand if [ "${DEVICETYPE}" = "ippp" -o "${DEVICETYPE}" = "isdn" ] && \ - [ "$DIALMODE" = "auto" ] ; then - if [ -z "$GATEWAY" ] ; then - /sbin/ip route add default ${METRIC:+metric} \ - ${WINDOW:+window $WINDOW} dev ${DEVICE} + [ "$DIALMODE" = "auto" ] ; then + if [ -z "$GATEWAY" ] ; then + /sbin/ip route add default ${METRIC:+metric} \ + ${WINDOW:+window $WINDOW} dev ${DEVICE} + else + /sbin/ip route add default ${METRIC:+metric} \ + ${WINDOW:+window $WINDOW} via ${GATEWAY} + fi else - /sbin/ip route add default ${METRIC:+metric} \ - ${WINDOW:+window $WINDOW} via ${GATEWAY} + add_default_route ${DEVICE} fi -else - add_default_route ${DEVICE} -fi fi # Reset firewall ZONE to "default": |