diff options
author | Bill Nottingham <notting@redhat.com> | 2009-03-20 12:48:32 -0400 |
---|---|---|
committer | Harald Hoyer <harald@redhat.com> | 2009-05-04 16:04:58 +0200 |
commit | 3484d8ed7b9b7eaceef9e1019f52c42121c80c67 (patch) | |
tree | f91d1509aa5eafc26a8542f0638ec1fbd744ac89 | |
parent | 865c59d70c501ad2554c9a3e5a6d3e3e7f9bf4bb (diff) | |
download | initscripts-3484d8ed7b9b7eaceef9e1019f52c42121c80c67.tar initscripts-3484d8ed7b9b7eaceef9e1019f52c42121c80c67.tar.gz initscripts-3484d8ed7b9b7eaceef9e1019f52c42121c80c67.tar.bz2 initscripts-3484d8ed7b9b7eaceef9e1019f52c42121c80c67.tar.xz initscripts-3484d8ed7b9b7eaceef9e1019f52c42121c80c67.zip |
Allow passing of arguments to dhcp6c (#437949, <pekkas@netcore.fi>)
-rw-r--r-- | sysconfig.txt | 4 | ||||
-rwxr-xr-x | sysconfig/network-scripts/ifup-eth | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sysconfig.txt b/sysconfig.txt index 1276d036..ed04e9eb 100644 --- a/sysconfig.txt +++ b/sysconfig.txt @@ -659,6 +659,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 33df60f0..9feb7981 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -300,9 +300,9 @@ fi if [ "${NETWORKING_IPV6}" = "yes" ]; then /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; fi |