diff options
author | Bill Nottingham <notting@redhat.com> | 2010-01-08 17:12:09 -0500 |
---|---|---|
committer | Bill Nottingham <notting@redhat.com> | 2010-01-08 17:18:36 -0500 |
commit | f62244b39af4360bbf701634014f124654aedc6d (patch) | |
tree | 8623fb26c56dadac4d2db0bffe961027bae5909f /sysconfig/network-scripts/ifup-eth | |
parent | bd0bb1a92c749739696f5ad14fc68d1baf305ce0 (diff) | |
download | initscripts-f62244b39af4360bbf701634014f124654aedc6d.tar initscripts-f62244b39af4360bbf701634014f124654aedc6d.tar.gz initscripts-f62244b39af4360bbf701634014f124654aedc6d.tar.bz2 initscripts-f62244b39af4360bbf701634014f124654aedc6d.tar.xz initscripts-f62244b39af4360bbf701634014f124654aedc6d.zip |
Run '/sbin/dhclient -6' instead of /sbin/dhcp6c (#553017, <dcantrell@redhat.com>)
The ISC software is now used for DHCPv6 support, so run dhclient in
DHCPv6 mode instead of the older /sbin/dhcp6c program. Still honor the
same configuration variables.
Diffstat (limited to 'sysconfig/network-scripts/ifup-eth')
-rwxr-xr-x | sysconfig/network-scripts/ifup-eth | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index 1fa871db..d3bb25b6 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -305,10 +305,8 @@ fi # IPv6 initialisation? /etc/sysconfig/network-scripts/ifup-ipv6 ${CONFIG} -if [[ "${DHCPV6C}" = [Yy1]* ]] && [ -x /sbin/dhcp6c ]; then - /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 +if [[ "${DHCPV6C}" = [Yy1]* ]] && [ -x /sbin/dhclient ]; then + /sbin/dhclient -6 ${DHCPV6C_OPTIONS} ${DEVICE} -lf /var/lib/dhclient/dhclient6-${DEVICE}.leases -pf /var/run/dhclient6-${DEVICE}.pid fi exec /etc/sysconfig/network-scripts/ifup-post ${CONFIG} ${2} |