Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
7eb99473
Commit
7eb99473
authored
Oct 20, 2016
by
David Johnson
Browse files
Always set STATICRUNDIR to /usr/local/etc/emulab, never /etc/emulab .
parent
c3f5359b
Changes
2
Hide whitespace changes
Inline
Side-by-side
clientside/tmcc/common/paths.pm
View file @
7eb99473
...
...
@@ -46,12 +46,11 @@ if (-d "/usr/local/etc/emulab") {
unshift
(
@INC
,
"
/usr/local/etc/emulab
");
if
(
-
d
"
/etc/emulab
")
{
$ETCDIR
=
"
/etc/emulab
";
$STATICRUNDIR
=
"
/etc/emulab/run
";
}
else
{
$ETCDIR
=
"
/usr/local/etc/emulab
";
$STATICRUNDIR
=
"
/usr/local/etc/emulab/run
";
}
$STATICRUNDIR
=
"
/usr/local/etc/emulab/run
";
$VARDIR
=
"
/var/emulab
";
$BOOTDIR
=
"
/var/emulab/boot
";
$LOGDIR
=
"
/var/emulab/logs
";
...
...
clientside/tmcc/common/paths.sh
View file @
7eb99473
...
...
@@ -35,11 +35,10 @@ if [ -d /usr/local/etc/emulab ]; then
BINDIR
=
/usr/local/etc/emulab
if
[
-e
/etc/emulab/client.pem
]
;
then
ETCDIR
=
/etc/emulab
STATICRUNDIR
=
/etc/emulab/run
else
ETCDIR
=
/usr/local/etc/emulab
STATICRUNDIR
=
/usr/local/etc/emulab/run
fi
STATICRUNDIR
=
/usr/local/etc/emulab/run
VARDIR
=
/var/emulab
BOOTDIR
=
/var/emulab/boot
LOGDIR
=
/var/emulab/logs
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment