commit ba2ba5c011a3fb13cba538296b70888dd0fb129b
author Matt Gumbel <matthew.k.gumbel@intel.com> Fri Jan 04 09:53:42 2013 -0800
committer Matt Gumbel <matthew.k.gumbel@intel.com> Fri Jan 04 10:18:45 2013 -0800
tree 0d5001dd448605c1cc67ed3adcdeee5ce79e9ea2
parent 7cd450719a78b6079d30608473cb36d7e4be2cb9

Fix dhcpcd startup when net.hostname is not set

Commit 62d6f74 swapped p2p_interface and DHCP_CONFIG_PATH
erroneously. This reverts them to their correct ordering and makes dhcpcd
startup work again.

Change-Id: Iea033a7e0dad98bb2a63fb39755330675cfbb0ab
Signed-off-by: Matt Gumbel <matthew.k.gumbel@intel.com>

libnetutils/dhcp_utils.c

diff --git a/libnetutils/dhcp_utils.c b/libnetutils/dhcp_utils.c
index d0ca90a..b4caaf9 100644
--- a/libnetutils/dhcp_utils.c
+++ b/libnetutils/dhcp_utils.c
@@ -211,7 +211,7 @@
                  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) {