switch /var/run to /run
Since /var/run is a symlink to /run, and we want to avoid going
through the stateful /var whenever possible, use the direct path.
BUG=chromium:699880
TEST=precq passes
Change-Id: I796f333573093323f4134cf715fe9c4317a242ad
Reviewed-on: https://chromium-review.googlesource.com/453000
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Kirtika Ruchandani <kirtika@chromium.org>
diff --git a/config_unittest.cc b/config_unittest.cc
index 59516af..4880e69 100644
--- a/config_unittest.cc
+++ b/config_unittest.cc
@@ -48,7 +48,7 @@
const char kSsid[] = "TestSsid";
const char kInterface[] = "uap0";
const char kBridgeInterface[] = "br0";
-const char kControlInterfacePath[] = "/var/run/apmanager/hostapd/ctrl_iface";
+const char kControlInterfacePath[] = "/run/apmanager/hostapd/ctrl_iface";
const char kPassphrase[] = "Passphrase";
const char k24GHzHTCapab[] = "[LDPC SMPS-STATIC GF SHORT-GI-20]";
const char k5GHzHTCapab[] =
@@ -79,7 +79,7 @@
"channel=6\n"
"interface=uap0\n"
"hw_mode=g\n"
- "ctrl_interface=/var/run/apmanager/hostapd/ctrl_iface\n"
+ "ctrl_interface=/run/apmanager/hostapd/ctrl_iface\n"
#if !defined(__ANDROID__)
"ctrl_interface_group=apmanager\n"
#else
diff --git a/dhcp_server.cc b/dhcp_server.cc
index ab7b634..ece2d70 100644
--- a/dhcp_server.cc
+++ b/dhcp_server.cc
@@ -31,9 +31,9 @@
#if !defined(__ANDROID__)
const char DHCPServer::kDnsmasqPath[] = "/usr/sbin/dnsmasq";
const char DHCPServer::kDnsmasqConfigFilePathFormat[] =
- "/var/run/apmanager/dnsmasq/dhcpd-%d.conf";
+ "/run/apmanager/dnsmasq/dhcpd-%d.conf";
const char DHCPServer::kDHCPLeasesFilePathFormat[] =
- "/var/run/apmanager/dnsmasq/dhcpd-%d.leases";
+ "/run/apmanager/dnsmasq/dhcpd-%d.leases";
#else
const char DHCPServer::kDnsmasqPath[] = "/system/bin/dnsmasq";
const char DHCPServer::kDnsmasqConfigFilePathFormat[] =
@@ -103,7 +103,7 @@
dnsmasq_process_->AddArg(base::StringPrintf("--conf-file=%s",
file_name.c_str()));
#if defined(__ANDROID__)
- // dnsmasq normally creates a pid file in /var/run/dnsmasq.pid. Overwrite
+ // dnsmasq normally creates a pid file in /run/dnsmasq.pid. Overwrite
// this file path for Android.
dnsmasq_process_->AddArg(
base::StringPrintf("--pid-file=%s", kDnsmasqPidFilePath));
diff --git a/dhcp_server_unittest.cc b/dhcp_server_unittest.cc
index ca118b9..447daa4 100644
--- a/dhcp_server_unittest.cc
+++ b/dhcp_server_unittest.cc
@@ -48,7 +48,7 @@
"interface=test_interface\n"
#if !defined(__ANDROID__)
"user=apmanager\n"
- "dhcp-leasefile=/var/run/apmanager/dnsmasq/dhcpd-1.leases\n";
+ "dhcp-leasefile=/run/apmanager/dnsmasq/dhcpd-1.leases\n";
#else
"user=system\n"
"dhcp-leasefile=/data/misc/apmanager/dnsmasq/dhcpd-1.leases\n";
@@ -57,7 +57,7 @@
#if !defined(__ANDROID__)
const char kBinSleep[] = "/bin/sleep";
const char kDnsmasqConfigFilePath[] =
- "/var/run/apmanager/dnsmasq/dhcpd-1.conf";
+ "/run/apmanager/dnsmasq/dhcpd-1.conf";
#else
const char kBinSleep[] = "/system/bin/sleep";
const char kDnsmasqConfigFilePath[] =
diff --git a/hostapd_monitor.cc b/hostapd_monitor.cc
index 29785cb..cdc5bfc 100644
--- a/hostapd_monitor.cc
+++ b/hostapd_monitor.cc
@@ -36,7 +36,7 @@
// static.
#if !defined(__ANDROID__)
const char HostapdMonitor::kLocalPathFormat[] =
- "/var/run/apmanager/hostapd/hostapd_ctrl_%s";
+ "/run/apmanager/hostapd/hostapd_ctrl_%s";
#else
const char HostapdMonitor::kLocalPathFormat[] =
"/data/misc/apmanager/hostapd/hostapd_ctrl_%s";
diff --git a/init/apmanager.conf b/init/apmanager.conf
index 17052d2..8721d0b 100644
--- a/init/apmanager.conf
+++ b/init/apmanager.conf
@@ -33,10 +33,10 @@
logger -p err -t "$UPSTART_JOB" "Failed to load cfg80211"
# Create directory for storing config files.
- mkdir -m 0755 -p /var/run/apmanager/hostapd
- mkdir -m 0755 -p /var/run/apmanager/dnsmasq
- chown -R apmanager:apmanager /var/run/apmanager/hostapd
- chown -R apmanager:apmanager /var/run/apmanager/dnsmasq
+ mkdir -m 0755 -p /run/apmanager/hostapd
+ mkdir -m 0755 -p /run/apmanager/dnsmasq
+ chown -R apmanager:apmanager /run/apmanager/hostapd
+ chown -R apmanager:apmanager /run/apmanager/dnsmasq
end script
exec /usr/bin/apmanager --v="${APMANAGER_LOG_LEVEL}"
diff --git a/service.cc b/service.cc
index e973da9..68aa6d2 100644
--- a/service.cc
+++ b/service.cc
@@ -43,9 +43,9 @@
#if !defined(__ANDROID__)
const char Service::kHostapdPath[] = "/usr/sbin/hostapd";
const char Service::kHostapdConfigPathFormat[] =
- "/var/run/apmanager/hostapd/hostapd-%d.conf";
+ "/run/apmanager/hostapd/hostapd-%d.conf";
const char Service::kHostapdControlInterfacePath[] =
- "/var/run/apmanager/hostapd/ctrl_iface";
+ "/run/apmanager/hostapd/ctrl_iface";
#else
const char Service::kHostapdPath[] = "/system/bin/hostapd";
const char Service::kHostapdConfigPathFormat[] =
diff --git a/service_unittest.cc b/service_unittest.cc
index 80da773..33e4446 100644
--- a/service_unittest.cc
+++ b/service_unittest.cc
@@ -55,7 +55,7 @@
#if !defined(__ANDROID__)
const char kBinSleep[] = "/bin/sleep";
const char kHostapdConfigFilePath[] =
- "/var/run/apmanager/hostapd/hostapd-1.conf";
+ "/run/apmanager/hostapd/hostapd-1.conf";
#else
const char kBinSleep[] = "/system/bin/sleep";
const char kHostapdConfigFilePath[] =
