Commit b4bd337c authored by Mike Hibler's avatar Mike Hibler

Minor fixes for storage hosts.

parent 6c7d6301
...@@ -3242,7 +3242,7 @@ sub getgenvnodeconfig($) ...@@ -3242,7 +3242,7 @@ sub getgenvnodeconfig($)
sub genvnodesetup($;$$) sub genvnodesetup($;$$)
{ {
my ($vid) = @_; my ($vid) = @_;
my $issharedhost = SHAREDHOST(); my $issharedhost = (SHAREDHOST() || STORAGEHOST());
# #
# Set global vnodeid for tmcc commands. # Set global vnodeid for tmcc commands.
...@@ -3312,10 +3312,8 @@ sub genvnodesetup($;$$) ...@@ -3312,10 +3312,8 @@ sub genvnodesetup($;$$)
} }
# #
# Tell libtmcc to get the full config for the jail. At the moment # Tell libtmcc to get the full config for the jail. The full config
# we do not use SFS inside jails, so okay to do this now (usually # will be copied to the proper location inside the jail by mkjail.
# have to call initsfs() first). The full config will be copied
# to the proper location inside the jail by mkjail.
# #
tmccclrconfig() tmccclrconfig()
if ($issharedhost); if ($issharedhost);
......
...@@ -226,7 +226,7 @@ if ( $doplab && !($killit || $haltit) && -e "/vsys/enter_admin.in" ) { ...@@ -226,7 +226,7 @@ if ( $doplab && !($killit || $haltit) && -e "/vsys/enter_admin.in" ) {
libsetup_setvnodeid($vnodeid); libsetup_setvnodeid($vnodeid);
# Tell tmcc library too, although thats already been done with previous call. # Tell tmcc library too, although thats already been done with previous call.
configtmcc("subnode", $vnodeid); configtmcc("subnode", $vnodeid);
if (SHAREDHOST()) { if (SHAREDHOST() || STORAGEHOST()) {
# Nodes come and go ... # Nodes come and go ...
configtmcc("nocache", 1); configtmcc("nocache", 1);
} }
...@@ -955,7 +955,8 @@ sub hackwaitandexit($) ...@@ -955,7 +955,8 @@ sub hackwaitandexit($)
elsif ($fakevnode) { elsif ($fakevnode) {
$goofy = CONFDIR() . "/evproxy.pid"; $goofy = CONFDIR() . "/evproxy.pid";
} }
elsif ($dojail && (-e "/vz" || -e "/etc/xen" || -e "/etc/emulab/docker")) { elsif ($dojail && (-e "/vz" || -e "/etc/xen" ||
-e "/etc/emulab/docker" || $isfreenas)) {
$goofy = CONFDIR() . "/running"; $goofy = CONFDIR() . "/running";
} }
else { else {
......
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