Commit 7eb99473 authored by David Johnson's avatar David Johnson
Browse files

Always set STATICRUNDIR to /usr/local/etc/emulab, never /etc/emulab .

parent c3f5359b
...@@ -46,12 +46,11 @@ if (-d "/usr/local/etc/emulab") { ...@@ -46,12 +46,11 @@ if (-d "/usr/local/etc/emulab") {
unshift(@INC, "/usr/local/etc/emulab"); unshift(@INC, "/usr/local/etc/emulab");
if (-d "/etc/emulab") { if (-d "/etc/emulab") {
$ETCDIR = "/etc/emulab"; $ETCDIR = "/etc/emulab";
$STATICRUNDIR = "/etc/emulab/run";
} }
else { else {
$ETCDIR = "/usr/local/etc/emulab"; $ETCDIR = "/usr/local/etc/emulab";
$STATICRUNDIR = "/usr/local/etc/emulab/run";
} }
$STATICRUNDIR = "/usr/local/etc/emulab/run";
$VARDIR = "/var/emulab"; $VARDIR = "/var/emulab";
$BOOTDIR = "/var/emulab/boot"; $BOOTDIR = "/var/emulab/boot";
$LOGDIR = "/var/emulab/logs"; $LOGDIR = "/var/emulab/logs";
......
...@@ -35,11 +35,10 @@ if [ -d /usr/local/etc/emulab ]; then ...@@ -35,11 +35,10 @@ if [ -d /usr/local/etc/emulab ]; then
BINDIR=/usr/local/etc/emulab BINDIR=/usr/local/etc/emulab
if [ -e /etc/emulab/client.pem ]; then if [ -e /etc/emulab/client.pem ]; then
ETCDIR=/etc/emulab ETCDIR=/etc/emulab
STATICRUNDIR=/etc/emulab/run
else else
ETCDIR=/usr/local/etc/emulab ETCDIR=/usr/local/etc/emulab
STATICRUNDIR=/usr/local/etc/emulab/run
fi fi
STATICRUNDIR=/usr/local/etc/emulab/run
VARDIR=/var/emulab VARDIR=/var/emulab
BOOTDIR=/var/emulab/boot BOOTDIR=/var/emulab/boot
LOGDIR=/var/emulab/logs LOGDIR=/var/emulab/logs
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment