View | Details | Raw Unified | Return to bug 136844
Collapse All | Expand All

(-)/sbin/modify_resolvconf (-2 / +3 lines)
Lines 142-148 Link Here
142
  if [ -n "$DNS" ] ; then
142
  if [ -n "$DNS" ] ; then
143
    mv $TMP_DATA $TMP_FILE
143
    mv $TMP_DATA $TMP_FILE
144
    sed "/^[[:space:]]*nameserver[[:space:]]/d" $TMP_FILE > $TMP_DATA
144
    sed "/^[[:space:]]*nameserver[[:space:]]/d" $TMP_FILE > $TMP_DATA
145
    for a in $DNS; do
145
    for a in $DNS $MODIFY_RESOLV_CONF_ALWAYS_ADD; do
146
      echo "nameserver $a" >> $TMP_DATA
146
      echo "nameserver $a" >> $TMP_DATA
147
    done
147
    done
148
  fi
148
  fi
Lines 421-427 Link Here
421
421
422
eval `grep "^[[:space:]]*\(\
422
eval `grep "^[[:space:]]*\(\
423
MODIFY_RESOLV_CONF_DYNAMICALLY\|\
423
MODIFY_RESOLV_CONF_DYNAMICALLY\|\
424
MODIFY_NAMED_CONF_DYNAMICALLY\
424
MODIFY_NAMED_CONF_DYNAMICALLY\|\
425
MODIFY_RESOLV_CONF_ALWAYS_ADD\
425
\)=" /etc/sysconfig/network/config 2>/dev/null`
426
\)=" /etc/sysconfig/network/config 2>/dev/null`
426
427
427
if [ "$MODIFY_NAMED_CONF_DYNAMICALLY" = "yes" ] ; then
428
if [ "$MODIFY_NAMED_CONF_DYNAMICALLY" = "yes" ] ; then

Return to bug 136844