Update DHCPConfig with the new rundir for dhcpcd.
For dhcpcd to run as a regular user, it needs to be able to write
lease files and pid files to /var. Lease files are already being written to
/var/lib/dhcpcd/. Update DHCPConfig to use /var/run/dhcpcd/ for pid files,
so that we can later chown() both to the 'dhcp' user.
BUG=chromium-os:28336
TEST=dhcp_config_unittest
TEST=network_netperf2 to verify networking.
TEST=Connect and disconnect networks and check that pid files get deleted.
CQ-DEPEND=I655f730aaf35a4ed71d0ac01a7850b8601999fdc,I67eb52c74c7f66e83d95b7bb26b313443acfbb91
Change-Id: I3844dcc511d6867b4dc2d0cc62d5a59226358c88
Reviewed-on: https://gerrit.chromium.org/gerrit/21131
Tested-by: Jorge Lucangeli Obes <jorgelo@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Commit-Ready: Jorge Lucangeli Obes <jorgelo@chromium.org>
diff --git a/dhcp_config_unittest.cc b/dhcp_config_unittest.cc
index 38f11bb..7cebd32 100644
--- a/dhcp_config_unittest.cc
+++ b/dhcp_config_unittest.cc
@@ -115,7 +115,7 @@
EXPECT_TRUE(temp_dir_.CreateUniqueTempDir());
config->root_ = temp_dir_.path();
- FilePath varrun = temp_dir_.path().Append("var/run");
+ FilePath varrun = temp_dir_.path().Append("var/run/dhcpcd");
EXPECT_TRUE(file_util::CreateDirectory(varrun));
pid_file_ = varrun.Append(base::StringPrintf("dhcpcd-%s.pid", kDeviceName));
FilePath varlib = temp_dir_.path().Append("var/lib/dhcpcd");