Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bab2ba3e authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 6d9589c3: Merge "Fix dhcpcd startup when net.hostname is not set" 

* commit '6d9589c3':
  Fix dhcpcd startup when net.hostname is not set
parents ba900f2e 6d9589c3

libnetutils/dhcp_utils.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -211,7 +211,7 @@ int dhcp_do_request(const char *interface, 
                 p2p_interface, DHCP_CONFIG_PATH, prop_value, interface);

                 p2p_interface, DHCP_CONFIG_PATH, prop_value, interface);

    else

    else

        snprintf(daemon_cmd, sizeof(daemon_cmd), "%s_%s:-f %s %s", DAEMON_NAME,

        snprintf(daemon_cmd, sizeof(daemon_cmd), "%s_%s:-f %s %s", DAEMON_NAME,

                 DHCP_CONFIG_PATH, p2p_interface, interface);

                 p2p_interface, DHCP_CONFIG_PATH, interface);

    memset(prop_value, '\0', PROPERTY_VALUE_MAX);

    memset(prop_value, '\0', PROPERTY_VALUE_MAX);

    property_set(ctrl_prop, daemon_cmd);

    property_set(ctrl_prop, daemon_cmd);

    if (wait_for_property(daemon_prop_name, desired_status, 10) < 0) {

    if (wait_for_property(daemon_prop_name, desired_status, 10) < 0) {