All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit ce8e5382 authored by Mike Hibler's avatar Mike Hibler

A couple of NFS MFS stragglers.

parent fc6f1505
...@@ -386,7 +386,7 @@ sub TB_OSID_VERSLEN() { 12; } ...@@ -386,7 +386,7 @@ sub TB_OSID_VERSLEN() { 12; }
sub TB_OSID_MBKERNEL() { "_KERNEL_"; } # multiboot kernel OSID sub TB_OSID_MBKERNEL() { "_KERNEL_"; } # multiboot kernel OSID
# Magic OSID path # Magic OSID path
sub TB_OSID_PATH_NFS() { "@NFSMFS_ROOT@" ? "fs:@NFSMFS_ROOT@" : "" }; sub TB_OSID_PATH_NFS() { "@NFSMFS_ROOT@" ne "" ? "fs:@NFSMFS_ROOT@" : "" };
# Magic MFS constants # Magic MFS constants
sub TB_OSID_FREEBSD_MFS() { "FREEBSD-MFS" }; sub TB_OSID_FREEBSD_MFS() { "FREEBSD-MFS" };
......
...@@ -4479,10 +4479,26 @@ sub NeedsAdminMFS($) ...@@ -4479,10 +4479,26 @@ sub NeedsAdminMFS($)
{ {
my ($self) = @_; my ($self) = @_;
if ($self->op_mode() eq "PXEFBSD" || $self->next_op_mode() eq "PXEFBSD") { # currently in admin MFS
if ($self->op_mode() eq "PXEFBSD") {
return 1; return 1;
} }
# scheduled to go into admin MFS next
if ($self->next_op_mode() eq "PXEFBSD") {
return 1;
}
# set to go into admin MFS after one-time boot
# XXX needs more work, MFS never gets created in this case
# only comes up if we turn on node_admin while a frisbee is scheduled
if (0 && $self->next_boot_osid() && $self->temp_boot_osid()) {
require OSImage;
if (OSImage->Lookup($self->temp_boot_osid)->IsNfsMfs()) {
return 1;
}
}
return 0; return 0;
} }
......
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