Commit 9a7fa4e8 authored by Mike Hibler's avatar Mike Hibler
Browse files

Fixes to FreeBSD 11.1 Emulab install.

parent 9ff2f4d3
...@@ -232,7 +232,7 @@ $ARCHSUPPORT = @ARCHIVESUPPORT@; ...@@ -232,7 +232,7 @@ $ARCHSUPPORT = @ARCHIVESUPPORT@;
$BROWSER_CONSOLE_ENABLE = @BROWSER_CONSOLE_ENABLE@; $BROWSER_CONSOLE_ENABLE = @BROWSER_CONSOLE_ENABLE@;
$WITHZFS = @WITHZFS@; $WITHZFS = @WITHZFS@;
$WITHAMD = @WITHAMD@; $WITHAMD = @WITHAMD@;
$IMAGEUPLOADONFS = @IMAGEUPLOADONFS@; $IMAGEUPLOADTOFS = @IMAGEUPLOADTOFS@;
# #
# Python/Perl paths # Python/Perl paths
...@@ -246,6 +246,7 @@ $EMULAB_PERL_PATH = "/usr/bin/perl"; ...@@ -246,6 +246,7 @@ $EMULAB_PERL_PATH = "/usr/bin/perl";
$EMULAB_PYTHON_PATH = "/usr/local/bin/python"; $EMULAB_PYTHON_PATH = "/usr/local/bin/python";
$PORT_PERL_PATH = "/usr/local/bin/perl5"; $PORT_PERL_PATH = "/usr/local/bin/perl5";
$PORT_PYTHON_PATH = "/usr/local/bin/python2"; $PORT_PYTHON_PATH = "/usr/local/bin/python2";
$PORT_PYTHON_PATH2 = "/usr/local/bin/python2.7";
# #
# Some programs we use # Some programs we use
......
...@@ -23,10 +23,13 @@ sub Install($$$) ...@@ -23,10 +23,13 @@ sub Install($$$)
}; };
Phase "pythonlink", "Looking for working $EMULAB_PYTHON_PATH link", sub { Phase "pythonlink", "Looking for working $EMULAB_PYTHON_PATH link", sub {
DoneIfExecutable($EMULAB_PYTHON_PATH); DoneIfExecutable($EMULAB_PYTHON_PATH);
if (! -x $PORT_PYTHON_PATH) { if (-x $PORT_PYTHON_PATH) {
ExecQuietFatal("ln -sf $PORT_PYTHON_PATH $EMULAB_PYTHON_PATH");
} elsif (-x $PORT_PYTHON_PATH2) {
ExecQuietFatal("ln -sf $PORT_PYTHON_PATH2 $EMULAB_PYTHON_PATH");
} else {
PhaseFail("$PORT_PYTHON_PATH does not exist!"); PhaseFail("$PORT_PYTHON_PATH does not exist!");
} }
ExecQuietFatal("ln -sf $PORT_PYTHON_PATH $EMULAB_PYTHON_PATH");
}; };
Phase "rsync", "Looking for rsync", sub { Phase "rsync", "Looking for rsync", sub {
DoneIfPackageInstalled("rsync"); DoneIfPackageInstalled("rsync");
......
...@@ -24,10 +24,13 @@ sub Install($$$) ...@@ -24,10 +24,13 @@ sub Install($$$)
}; };
Phase "pythonlink", "Looking for working $EMULAB_PYTHON_PATH link", sub { Phase "pythonlink", "Looking for working $EMULAB_PYTHON_PATH link", sub {
DoneIfExecutable($EMULAB_PYTHON_PATH); DoneIfExecutable($EMULAB_PYTHON_PATH);
if (! -x $PORT_PYTHON_PATH) { if (-x $PORT_PYTHON_PATH) {
ExecQuietFatal("ln -sf $PORT_PYTHON_PATH $EMULAB_PYTHON_PATH");
} elsif (-x $PORT_PYTHON_PATH2) {
ExecQuietFatal("ln -sf $PORT_PYTHON_PATH2 $EMULAB_PYTHON_PATH");
} else {
PhaseFail("$PORT_PYTHON_PATH does not exist!"); PhaseFail("$PORT_PYTHON_PATH does not exist!");
} }
ExecQuietFatal("ln -sf $PORT_PYTHON_PATH $EMULAB_PYTHON_PATH");
}; };
Phase "rsync", "Looking for rsync and installing", sub { Phase "rsync", "Looking for rsync and installing", sub {
DoneIfPackageInstalled("rsync"); DoneIfPackageInstalled("rsync");
......
...@@ -24,10 +24,14 @@ sub Install($$$) ...@@ -24,10 +24,14 @@ sub Install($$$)
}; };
Phase "pythonlink", "Looking for working $EMULAB_PYTHON_PATH link", sub { Phase "pythonlink", "Looking for working $EMULAB_PYTHON_PATH link", sub {
DoneIfExecutable($EMULAB_PYTHON_PATH); DoneIfExecutable($EMULAB_PYTHON_PATH);
if (! -x $PORT_PYTHON_PATH) { if (-x $PORT_PYTHON_PATH) {
ExecQuietFatal("ln -sf $PORT_PYTHON_PATH $EMULAB_PYTHON_PATH");
} elsif (-x $PORT_PYTHON_PATH2) {
ExecQuietFatal("ln -sf $PORT_PYTHON_PATH2 $EMULAB_PYTHON_PATH");
} else {
PhaseFail("$PORT_PYTHON_PATH does not exist!"); PhaseFail("$PORT_PYTHON_PATH does not exist!");
} }
ExecQuietFatal("ln -sf $PORT_PYTHON_PATH $EMULAB_PYTHON_PATH");
}; };
Phase "rsync", "Looking for rsync and installing", sub { Phase "rsync", "Looking for rsync and installing", sub {
DoneIfPackageInstalled("rsync"); DoneIfPackageInstalled("rsync");
......
...@@ -18,7 +18,7 @@ sub Install($$$) ...@@ -18,7 +18,7 @@ sub Install($$$)
return 0 return 0
if ($isupdate); if ($isupdate);
if ($IMAGEUPLOADONFS) { if ($IMAGEUPLOADTOFS) {
push(@LOGFILES, "$LOGDIR/mfrisbeed.log"); push(@LOGFILES, "$LOGDIR/mfrisbeed.log");
push(@LOGFILES, "$LOGDIR/frisuploadd.log"); push(@LOGFILES, "$LOGDIR/frisuploadd.log");
} }
...@@ -110,7 +110,7 @@ sub Install($$$) ...@@ -110,7 +110,7 @@ sub Install($$$)
print SC "*.*\t\t\t\t\t\t${LOGDIR}/elvin_gateway.log\n"; print SC "*.*\t\t\t\t\t\t${LOGDIR}/elvin_gateway.log\n";
print SC "!shellinabox\n"; print SC "!shellinabox\n";
print SC "*.*\t\t\t\t\t\t${LOGDIR}/shellinabox.log\n"; print SC "*.*\t\t\t\t\t\t${LOGDIR}/shellinabox.log\n";
if ($IMAGEUPLOADONFS) { if ($IMAGEUPLOADTOFS) {
print SC "!mfrisbeed\n"; print SC "!mfrisbeed\n";
print SC "*.*\t\t\t\t\t\t${LOGDIR}/mfrisbeed.log\n"; print SC "*.*\t\t\t\t\t\t${LOGDIR}/mfrisbeed.log\n";
print SC "!frisuploadd\n"; print SC "!frisuploadd\n";
......
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