Change references to /config to /fiber/config.
This is the first stage in converging upon /fiber
as a single root for writable filesystems.
Change-Id: I75d43875739aee992f1e1ca2cedb30ffd264167f
diff --git a/dm/binwifi.py b/dm/binwifi.py
index 56d3f98..b4335ab 100644
--- a/dm/binwifi.py
+++ b/dm/binwifi.py
@@ -45,7 +45,7 @@
# Unit tests can override these.
BINWIFI = ['wifi']
-CONMAN_DIR = ['/config/conman']
+CONMAN_DIR = ['/fiber/config/conman']
CONMAN_TMP_DIR = ['/tmp/conman']
STATIONS_DIR = ['/tmp/stations']
TMPWAVEGUIDE = ['/tmp/waveguide']
diff --git a/dm/dnsmasq.py b/dm/dnsmasq.py
index cbd6a1c..0b8dcdc 100644
--- a/dm/dnsmasq.py
+++ b/dm/dnsmasq.py
@@ -54,8 +54,8 @@
DASH_TO_UNDERSCORE = string.maketrans('-', '_')
# unit tests can override these
-DNSMASQCONFIG = ['/config/dnsmasq/cwmp.conf']
-DNSMASQLEASES = ['/config/dhcp.leases']
+DNSMASQCONFIG = ['/fiber/config/dnsmasq/cwmp.conf']
+DNSMASQLEASES = ['/fiber/config/dhcp.leases']
LOGCONFIG = True
RESTARTCMD = ['restart', 'dnsmasq']
diff --git a/dm/gfibertv.py b/dm/gfibertv.py
index fbc6bed..7e0280c 100644
--- a/dm/gfibertv.py
+++ b/dm/gfibertv.py
@@ -53,7 +53,7 @@
EASHEARTBEATFILE = ['/tmp/eas_heartbeat']
EASPORTFILE = ['/tmp/eas_service_port']
HNVRAM = ['hnvram']
-MYNICKFILE = ['/config/nickname']
+MYNICKFILE = ['/fiber/config/nickname']
NICKFILE = ['/tmp/nicknames']
SAGEFILES = ['/app/sage/*.properties.default*', '/rw/sage/*.properties']
TCPALGORITHM = ['/tmp/tcp_congestion_control']
diff --git a/dm/host.py b/dm/host.py
index 25e745d..ffc9178 100644
--- a/dm/host.py
+++ b/dm/host.py
@@ -64,7 +64,7 @@
# Client identification files
ANONID = ['anonid']
-DHCP_TAXONOMY_FILE = '/config/dhcp.fingerprints'
+DHCP_TAXONOMY_FILE = '/fiber/config/dhcp.fingerprints'
DNSSD_HOSTNAMES = '/tmp/dnssd_hostnames'
NETBIOS_HOSTNAMES = '/tmp/netbios_hostnames'
WIFI_TAXONOMY_DIR = '/tmp/wifi/fingerprints'
diff --git a/dm/wisp_netmanagement.py b/dm/wisp_netmanagement.py
index 7b1b37b..1c704f0 100644
--- a/dm/wisp_netmanagement.py
+++ b/dm/wisp_netmanagement.py
@@ -36,7 +36,7 @@
CATA181NETMANAGEMENT = BASE.Device.X_CATAWAMPUS_ORG.WispNetManagement
# These can be overridden by unit tests.
-CFG_JSON_FILE = '/config/chimera-cfg.json'
+CFG_JSON_FILE = '/fiber/config/chimera-cfg.json'
class WispNetManagement(CATA181NETMANAGEMENT):
diff --git a/extras/dnsmasq.conf b/extras/dnsmasq.conf
index 80a70d4..cd40f16 100644
--- a/extras/dnsmasq.conf
+++ b/extras/dnsmasq.conf
@@ -42,16 +42,16 @@
except-interface=wan0
# Store leases in flash
-dhcp-leasefile=/config/dnsmasq/leases
+dhcp-leasefile=/fiber/config/dnsmasq/leases
# Log lots of extra information about DHCP transactions.
log-dhcp
# Dynamic configurations pushed by ACS
-conf-dir=/config/dnsmasq/acs.conf
+conf-dir=/fiber/config/dnsmasq/acs.conf
# broadbandforum.org CWMP options
conf-file=/tmp/dnsmasq.cwmp.conf
# local modifications by developers
-conf-file=/config/dnsmasq/local.conf
+conf-file=/fiber/config/dnsmasq/local.conf
diff --git a/extras/set-acs b/extras/set-acs
index de3cfda..ed1d71c 100755
--- a/extras/set-acs
+++ b/extras/set-acs
@@ -112,7 +112,7 @@
FINDACS_OK_HOLDOFF=$((59*60))
-[ -n "$configdir" ] || configdir=/config/tr69
+[ -n "$configdir" ] || configdir=/fiber/config/tr69
[ -n "$cwmpdir" ] || cwmpdir=/tmp/cwmp
[ -n "$find_acs" ] || find_acs=find-acs
[ -n "$nowcmd" ] || nowcmd='date +%s'
diff --git a/platform/gfmedia/device.py b/platform/gfmedia/device.py
index d818f59..91d9edd 100755
--- a/platform/gfmedia/device.py
+++ b/platform/gfmedia/device.py
@@ -76,7 +76,7 @@
# Unit tests can override these with fake data
ACTIVEWAN = 'activewan'
AUXTEMP = '/tmp/gpio/aux1_temperature'
-CONFIGDIR = '/config/tr69'
+CONFIGDIR = '/fiber/config/tr69'
GINSTALL = 'ginstall'
HNVRAM = 'hnvram'
ISNETWORKBOX = 'is-network-box'
diff --git a/platform/gfonu/device.py b/platform/gfonu/device.py
index 0985ebc..52731ee 100644
--- a/platform/gfonu/device.py
+++ b/platform/gfonu/device.py
@@ -56,7 +56,7 @@
INTERNAL_ERROR = 9002
# Unit tests can override these with fake data
-CONFIGDIR = '/config/tr69'
+CONFIGDIR = '/fiber/config/tr69'
DOWNLOADDIR = '/tmp'
HNVRAM = 'hnvram'
HNVRAM_MTD = '/dev/mtd/hnvram'
diff --git a/platform/tomato/device.py b/platform/tomato/device.py
index 8f2f51d..fe777db 100755
--- a/platform/tomato/device.py
+++ b/platform/tomato/device.py
@@ -54,7 +54,7 @@
INSTALL_JFFS_IMAGE = 'install_jffs'
ITERIFS = pynetlinux.ifconfig.iterifs
JFFS_VERSION_FILE = '/jffs/jffs-version.txt'
-CONFIGDIR = '/config/tr69'
+CONFIGDIR = '/fiber/config/tr69'
DOWNLOADDIR = '/mnt/share/download'
diff --git a/tr/experiment.py b/tr/experiment.py
index d989ddd..038c371 100644
--- a/tr/experiment.py
+++ b/tr/experiment.py
@@ -31,7 +31,7 @@
import x_catawampus_tr181_2_0
REGDIR = helpers.Path('/tmp/experiments')
-ACTIVEDIR = helpers.Path('/config/experiments')
+ACTIVEDIR = helpers.Path('/fiber/config/experiments')
BASE = x_catawampus_tr181_2_0.X_CATAWAMPUS_ORG_Device_v2_0
CATABASE = BASE.Device.X_CATAWAMPUS_ORG