aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sysconfig.txt8
-rwxr-xr-xsysconfig/network-scripts/ifup-post2
2 files changed, 7 insertions, 3 deletions
diff --git a/sysconfig.txt b/sysconfig.txt
index 3fed0b1d..a3139d77 100644
--- a/sysconfig.txt
+++ b/sysconfig.txt
@@ -287,6 +287,12 @@ Files in /etc/sysconfig/network-scripts/
ONBOOT=yes|no
USERCTL=yes|no
BOOTPROTO=none|bootp|dhcp
+ PEERDNS=yes|no
+ modify /etc/resolv.conf if peer uses msdns extension (PPP only) or
+ DNS{1,2} are set, default to "yes".
+ DNS{1,2}=<ipaddress>
+ provide DNS addresses that are dropped into the resolv.conf
+ file if PEERDNS is not set to "no".
If BOOTPROTO is not "none", then the only other item that
must be set is the DEVICE item; all the rest will be determined
@@ -315,8 +321,6 @@ Files in /etc/sysconfig/network-scripts/
If this variable is set, then the chat script (if it
exists) is ignored, and wvdial is used to open the
PPP connection.
- PEERDNS=yes|no
- modify /etc/resolv.conf if peer uses msdns extension
DEFROUTE=yes|no (set this interface as default route?)
ESCAPECHARS=yes|no (simplified interface here doesn't let people
specify which characters to escape; almost everyone can use
diff --git a/sysconfig/network-scripts/ifup-post b/sysconfig/network-scripts/ifup-post
index 838eb620..4a3d459c 100755
--- a/sysconfig/network-scripts/ifup-post
+++ b/sysconfig/network-scripts/ifup-post
@@ -28,7 +28,7 @@ if [ -n "$NEEDHOSTNAME" -a "${DEVICE}" != lo -a "${DEVICETYPE}" != "ppp" -a "${D
eval `/bin/ipcalc --silent --hostname ${IPADDR}` && set_hostname $HOSTNAME
fi
-if [ "$DEVICETYPE" = ppp -a "$PEERDNS" != no -a -n "$DNS1" ] &&
+if [ "$PEERDNS" != no -a -n "$DNS1" ] &&
tr=`mktemp /tmp/resolv.XXXXXX` ; then
# replace only the first two nameserver lines; cannot count on awk
# and do not know if sed is capable of this...