diff options
| author | Bill Nottingham <notting@redhat.com> | 2012-03-09 11:18:10 -0500 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2012-03-09 11:18:10 -0500 |
| commit | 60b84547c03ec7d82633f3c9d6939af4747a6bff (patch) | |
| tree | 07c354e96bfc9586b66183c1f9693c5161323867 /sysconfig/network-scripts/ifup-eth | |
| parent | 2858dfa0b9b2c56dad8d46d5ff9aabe05a67c870 (diff) | |
| download | initscripts-60b84547c03ec7d82633f3c9d6939af4747a6bff.tar initscripts-60b84547c03ec7d82633f3c9d6939af4747a6bff.tar.gz initscripts-60b84547c03ec7d82633f3c9d6939af4747a6bff.tar.bz2 initscripts-60b84547c03ec7d82633f3c9d6939af4747a6bff.tar.xz initscripts-60b84547c03ec7d82633f3c9d6939af4747a6bff.zip | |
Use NetworkManager-compatible lease file names by default.
Diffstat (limited to 'sysconfig/network-scripts/ifup-eth')
| -rwxr-xr-x | sysconfig/network-scripts/ifup-eth | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index 335394f8..9d926f23 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -192,7 +192,8 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then else DHCLIENTCONF=''; fi; - DHCLIENTARGS="${DHCLIENTARGS} -H ${DHCP_HOSTNAME:-${HOSTNAME%%.*}} ${ONESHOT} -q ${DHCLIENTCONF} -lf /var/lib/dhclient/dhclient-${DEVICE}.leases -pf /var/run/dhclient-${DEVICE}.pid" + generate_lease_file_name + DHCLIENTARGS="${DHCLIENTARGS} -H ${DHCP_HOSTNAME:-${HOSTNAME%%.*}} ${ONESHOT} -q ${DHCLIENTCONF} -lf ${LEASEFILE} -pf /var/run/dhclient-${DEVICE}.pid" echo echo -n $"Determining IP information for ${DEVICE}..." if [[ "${PERSISTENT_DHCLIENT}" != [yY1]* ]] && check_link_down ${DEVICE}; then @@ -299,7 +300,8 @@ fi # IPv6 initialisation? /etc/sysconfig/network-scripts/ifup-ipv6 ${CONFIG} if [[ "${DHCPV6C}" = [Yy1]* ]] && [ -x /sbin/dhclient ]; then - /sbin/dhclient -6 -1 ${DHCPV6C_OPTIONS} -lf /var/lib/dhclient/dhclient6-${DEVICE}.leases -pf /var/run/dhclient6-${DEVICE}.pid -H ${DHCP_HOSTNAME:-${HOSTNAME%%.*}} ${DEVICE} + generate_lease_file_name 6 + /sbin/dhclient -6 -1 ${DHCPV6C_OPTIONS} -lf ${LEASEFILE} -pf /var/run/dhclient6-${DEVICE}.pid -H ${DHCP_HOSTNAME:-${HOSTNAME%%.*}} ${DEVICE} fi if [ "${IPX}" = yes ]; then |