Attachment 1473303 Details for Bug 1526790 – Adding do_dhcp in file network-functions

[patch] Adding do_dhcp in file network-functions

initscripts.eth.alias.patch (text/plain), 3.81 KB, created by Jean-Claude on 2018-08-04 16:01:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jean-Claude

Created: 2018-08-04 16:01:07 UTC

Size: 3.81 KB

patch

obsolete

>diff -c /etc/sysconfig/network-scripts/ifup-aliases ./ifup-aliases
>*** /etc/sysconfig/network-scripts/ifup-aliases	2018-05-25 12:06:16.000000000 +0200
>--- ./ifup-aliases	2018-08-04 17:29:22.713059520 +0200
>***************
>*** 185,190 ****
>--- 185,194 ----
>          return 1
>      fi
>  
>+     if [ "${BOOTPROTO}" = "bootp" -o "${BOOTPROTO}" = "dhcp" ]; then
>+         do_dhclient
>+         exit
>+     fi
>      if [ -z "$DEVICE" -o -z "$IPADDR" ]; then
>          if [ -n "$IPV6ADDR" -a -n "$DEVICE" ] && ! is_false "$IPV6INIT"; then
>              /etc/sysconfig/network-scripts/ifup-ipv6 ${DEVICE}
>diff -c /etc/sysconfig/network-scripts/ifup-eth ./ifup-eth
>*** /etc/sysconfig/network-scripts/ifup-eth	2018-05-25 12:06:16.000000000 +0200
>--- ./ifup-eth	2018-08-04 17:21:00.862023131 +0200
>***************
>*** 195,235 ****
>  fi
>  
>  if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then
>!     if is_true "${PERSISTENT_DHCLIENT}"; then
>!         ONESHOT="";
>!     else
>!         ONESHOT="-1";
>!     fi;
>!     generate_config_file_name
>!     generate_lease_file_name
>! 
>!     # Initialize the dhclient args and obtain the hostname options if needed:
>!     DHCLIENTARGS="${DHCLIENTARGS} ${ONESHOT} -q ${DHCLIENTCONF} -lf ${LEASEFILE} -pf /run/dhclient-${DEVICE}.pid"
>!     set_hostname_options DHCLIENTARGS
>! 
>!     echo
>!     echo -n $"Determining IP information for ${DEVICE}..."
>!     if ! is_true "${PERSISTENT_DHCLIENT}" && check_link_down ${DEVICE}; then
>!         echo $" failed; no link present.  Check cable?"
>!         exit 1
>!     fi
>! 
>!     ethtool_set
>! 
>!     if /sbin/dhclient ${DHCLIENTARGS} ${DEVICE} ; then
>!         echo $" done."
>!         dhcpipv4="good"
>!     else
>!         echo $" failed."
>!         if is_true "${IPV4_FAILURE_FATAL}"; then
>!             exit 1
>!         fi
>!         if is_false "$IPV6INIT" || ! is_true "$DHCPV6C"; then
>!             exit 1
>!         fi
>!         net_log "Unable to obtain IPv4 DHCP address ${DEVICE}." warning
>!     fi
>!     # end dynamic device configuration
>  else 
>      if [ -z "${IPADDR}" -a -z "${IPADDR0}" -a -z "${IPADDR1}" -a -z "${IPADDR2}" ]; then
>          # enable device without IP, useful for e.g. PPPoE
>--- 195,201 ----
>  fi
>  
>  if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then
>!     do_dhclient
>  else 
>      if [ -z "${IPADDR}" -a -z "${IPADDR0}" -a -z "${IPADDR1}" -a -z "${IPADDR2}" ]; then
>          # enable device without IP, useful for e.g. PPPoE
>diff -c /etc/sysconfig/network-scripts/network-functions ./network-functions
>*** /etc/sysconfig/network-scripts/network-functions	2018-05-25 12:06:16.000000000 +0200
>--- ./network-functions	2018-08-04 17:45:11.759670353 +0200
>***************
>*** 742,744 ****
>--- 742,783 ----
>          unset DNS2
>      fi
>  }
>+ 
>+ do_dhclient()
>+ {
>+     if is_true "${PERSISTENT_DHCLIENT}"; then
>+         ONESHOT="";
>+     else
>+         ONESHOT="-1";
>+     fi;
>+     generate_config_file_name
>+     generate_lease_file_name
>+ 
>+     # Initialize the dhclient args and obtain the hostname options if needed:
>+     DHCLIENTARGS="${DHCLIENTARGS} ${ONESHOT} -q ${DHCLIENTCONF} -lf ${LEASEFILE} -pf /run/dhclient-${device}.pid"
>+     set_hostname_options DHCLIENTARGS
>+ 
>+     echo
>+     echo -n $"Determining IP information for ${DEVICE}..."
>+     if ! is_true "${PERSISTENT_DHCLIENT}" && check_link_down ${DEVICE}; then
>+         echo $" failed; no link present.  Check cable?"
>+         exit 1
>+     fi
>+ 
>+     ethtool_set
>+ 
>+     if /sbin/dhclient ${DHCLIENTARGS} ${DEVICE} ; then
>+         echo $" done."
>+         dhcpipv4="good"
>+     else
>+         echo $" failed."
>+         if is_true "${IPV4_FAILURE_FATAL}"; then
>+             exit 1
>+         fi
>+         if is_false "$IPV6INIT" || ! is_true "$DHCPV6C"; then
>+             exit 1
>+         fi
>+         net_log "Unable to obtain IPv4 DHCP address ${DEVICE}." warning
>+     fi
>+     # end dynamic device configuration
>+ }

Actions: View | Diff

Attachments on bug 1526790: 1471945 | 1473290 | 1473303