diff options
| author | David Kaspar [Dee'Kej] <dkaspar@redhat.com> | 2016-11-21 11:04:01 +0100 |
|---|---|---|
| committer | Dee'Kej <deekej@linuxmail.org> | 2016-11-21 16:34:07 +0100 |
| commit | 1bf0abad16066465581f3e535ca1055032e5c6ad (patch) | |
| tree | 88399cd982b05a38b34720cf61657b47a3c7c6f6 | |
| parent | 13bea111c52590a6c88c56cbc7a88c387560df3e (diff) | |
| download | initscripts-1bf0abad16066465581f3e535ca1055032e5c6ad.tar initscripts-1bf0abad16066465581f3e535ca1055032e5c6ad.tar.gz initscripts-1bf0abad16066465581f3e535ca1055032e5c6ad.tar.bz2 initscripts-1bf0abad16066465581f3e535ca1055032e5c6ad.tar.xz initscripts-1bf0abad16066465581f3e535ca1055032e5c6ad.zip | |
Fix regression in commit ca3cea691b6 - ${LEASEFILE} not specified
Related: RHBZ #1350602
| -rwxr-xr-x | sysconfig/network-scripts/ifup-eth | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth index aaf9b0a4..15f89ea3 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -180,10 +180,10 @@ if [ -n "${DYNCONFIG}" -a -x /sbin/dhclient ]; then if is_hostname_set; then # We already have the hostname ->> send it to DHCP: - DHCLIENTARGS="${DHCLIENTARGS} -H ${DHCP_HOSTNAME:-${HOSTNAME%%.*}} ${ONESHOT} -q ${DHCLIENTCONF} -lf ${LEASEFILE} -pf /var/run/dhclient-${DEVICE}.pid" + DHCLIENTARGS="${DHCLIENTARGS} -H ${DHCP_HOSTNAME:-${HOSTNAME%%.*}} ${ONESHOT} -q ${DHCLIENTCONF} -lf /var/lib/dhclient/dhclient-${DEVICE}.leases -pf /var/run/dhclient-${DEVICE}.pid" else # We need to acquire the hostname: - DHCLIENTARGS="${DHCLIENTARGS} ${DHCP_HOSTNAME:+-H $DHCP_HOSTNAME} ${ONESHOT} -q ${DHCLIENTCONF} -lf ${LEASEFILE} -pf /var/run/dhclient-${DEVICE}.pid" + DHCLIENTARGS="${DHCLIENTARGS} ${DHCP_HOSTNAME:+-H $DHCP_HOSTNAME} ${ONESHOT} -q ${DHCLIENTCONF} -lf /var/lib/dhclient/dhclient-${DEVICE}.leases -pf /var/run/dhclient-${DEVICE}.pid" fi echo @@ -318,10 +318,10 @@ if [[ "${DHCPV6C}" = [Yy1]* ]] && [ -x /sbin/dhclient ]; then if is_hostname_set; then # We already have the hostname ->> send it to DHCP: - DHCLIENTARGS="-6 -1 ${DHCPV6C_OPTIONS} ${DHCLIENTCONF} -lf ${LEASEFILE} -pf /var/run/dhclient6-${DEVICE}.pid -H ${DHCP_HOSTNAME:-${HOSTNAME%%.*}} ${DEVICE}" + DHCLIENTARGS="-6 -1 ${DHCPV6C_OPTIONS} ${DHCLIENTCONF} -lf /var/lib/dhclient/dhclient6-${DEVICE}.leases -pf /var/run/dhclient6-${DEVICE}.pid -H ${DHCP_HOSTNAME:-${HOSTNAME%%.*}} ${DEVICE}" else # We need to acquire the hostname: - DHCLIENTARGS="-6 -1 ${DHCPV6C_OPTIONS} ${DHCLIENTCONF} -lf ${LEASEFILE} -pf /var/run/dhclient6-${DEVICE}.pid ${DHCP_HOSTNAME:+-H $DHCP_HOSTNAME} ${DEVICE}" + DHCLIENTARGS="-6 -1 ${DHCPV6C_OPTIONS} ${DHCLIENTCONF} -lf /var/lib/dhclient/dhclient6-${DEVICE}.leases -pf /var/run/dhclient6-${DEVICE}.pid ${DHCP_HOSTNAME:+-H $DHCP_HOSTNAME} ${DEVICE}" fi if /sbin/dhclient "$DHCLIENTARGS"; then |