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

* commit '6d9589c33517c024ab992d1e2c1b8efd1b51e366':
  Fix dhcpcd startup when net.hostname is not set
This commit is contained in:
Elliott Hughes 2013-01-07 12:18:35 -08:00 committed by Android Git Automerger
commit bab2ba3e73

View file

@ -211,7 +211,7 @@ int dhcp_do_request(const char *interface,
p2p_interface, DHCP_CONFIG_PATH, prop_value, interface);
else
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);
property_set(ctrl_prop, daemon_cmd);
if (wait_for_property(daemon_prop_name, desired_status, 10) < 0) {