aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2009-03-20 12:48:32 -0400
committerBill Nottingham <notting@redhat.com>2009-03-20 12:48:32 -0400
commitf0003e3a245686929791b50896b2a4b22ff689a9 (patch)
treec0554f70273ff6bad084273cd236b390ed4fbb32
parenteb389d68f4637418983e4b514a67eb84cf2f4d7b (diff)
downloadinitscripts-f0003e3a245686929791b50896b2a4b22ff689a9.tar
initscripts-f0003e3a245686929791b50896b2a4b22ff689a9.tar.gz
initscripts-f0003e3a245686929791b50896b2a4b22ff689a9.tar.bz2
initscripts-f0003e3a245686929791b50896b2a4b22ff689a9.tar.xz
initscripts-f0003e3a245686929791b50896b2a4b22ff689a9.zip
Allow passing of arguments to dhcp6c (#437949, <pekkas@netcore.fi>)
-rw-r--r--sysconfig.txt4
-rwxr-xr-xsysconfig/network-scripts/ifup-eth6
2 files changed, 7 insertions, 3 deletions
diff --git a/sysconfig.txt b/sysconfig.txt
index e4759809..538a9e3d 100644
--- a/sysconfig.txt
+++ b/sysconfig.txt
@@ -675,6 +675,10 @@ Files in /etc/sysconfig/network-scripts/
DHCPV6C=yes|no
This will enable the DHCPv6 client, dhcp6c, to be run for the interface.
See man dhcp6c(8) and dhcp6c.conf(5).
+ DHCPV6C_OPTIONS=...
+ This will pass given arguments to the DHCPv6 client. For example,
+ "-I" option will request network information (e.g., DNS addresses)
+ only, not IPv6 addresses.
Ethernet-only items:
{IPXNETNUM,IPXPRIMARY,IPXACTIVE}_{802_2,802_3,ETHERII,SNAP}
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index 56e04888..5587ec69 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -303,9 +303,9 @@ fi
# IPv6 initialisation?
/etc/sysconfig/network-scripts/ifup-ipv6 ${CONFIG}
if [[ "${DHCPV6C}" = [Yy1]* ]] && [ -x /sbin/dhcp6c ]; then
- /sbin/dhcp6c ${DEVICE};
- dhcp6_pid=(`/bin/ps -eo 'pid,args' | /bin/grep "dhcp6c ${DEVICE}" | egrep -v grep`);
- echo ${dhcp6_pid[0]} > /var/run/dhcp6c_${DEVICE}.pid
+ /sbin/dhcp6c ${DHCPV6C_OPTIONS} ${DEVICE}
+ dhcp6_pid=(`/bin/ps -eo 'pid,args' | /bin/grep "dhcp6c ${DHCPV6C_OPTIONS} ${DEVICE}" | egrep -v grep`)
+ [ -n "$dhcp6_pid" ] && echo ${dhcp6_pid[0]} > /var/run/dhcp6c_${DEVICE}.pid
fi
if [ "${IPX}" = yes ]; then