diff options
| author | Bill Nottingham <notting@redhat.com> | 2000-12-12 08:10:37 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2000-12-12 08:10:37 +0000 |
| commit | e776fdd1ea74a05c057f9d18a3bb09b3849a2c4b (patch) | |
| tree | 663792ced75fdcf4984b4d9170f6d467cfb68df2 | |
| parent | 5de1b7a730964525debb9284346d6f17b2e3ac7f (diff) | |
| download | initscripts-e776fdd1ea74a05c057f9d18a3bb09b3849a2c4b.tar initscripts-e776fdd1ea74a05c057f9d18a3bb09b3849a2c4b.tar.gz initscripts-e776fdd1ea74a05c057f9d18a3bb09b3849a2c4b.tar.bz2 initscripts-e776fdd1ea74a05c057f9d18a3bb09b3849a2c4b.tar.xz initscripts-e776fdd1ea74a05c057f9d18a3bb09b3849a2c4b.zip | |
honor PEERDNS=no for pump and dhcpcd too (#18619)
| -rw-r--r-- | sysconfig.txt | 2 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sysconfig.txt b/sysconfig.txt index 2ff1cb83..9e055206 100644 --- a/sysconfig.txt +++ b/sysconfig.txt @@ -358,7 +358,7 @@ Files in /etc/sysconfig/network-scripts/ MTU= 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} are set, or if using pump or dhcpcd. 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". diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup index 63a89fff..b232f0c1 100755 --- a/sysconfig/network-scripts/ifup +++ b/sysconfig/network-scripts/ifup @@ -98,6 +98,10 @@ if [ -n "${DYNCONFIG}" ]; then PUMPARGS="${PUMPARGS} --lookup-hostname" DHCPCDARGS="${DHCPCDARGS} -H" fi + if [ "${PEERDNS}" = "no" ]; then + PUMPARGS="${PUMPARGS} -d" + DHCPDARGS="${DHCPDARGS -R" + fi echo -n "Determining IP information for ${DEVICE}..." if /sbin/pump ${PUMPARGS} -i ${DEVICE} ; then echo " done." |