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 10d2d75d authored by David Johnson's avatar David Johnson

Ensure existing Docker clientside LVMs are mounted after reload.

parent 721568af
......@@ -2023,35 +2023,41 @@ sub rootPreConfig($;$)
$tmplvname = $1;
}
if (!libvnode::lvExists($VGNAME,$tmplvname)) {
print "Creating container info FS ...\n";
if (createExtraFS($INFOFS, $VGNAME, "${infosize}G")) {
TBScriptUnlock();
return -1;
}
print "Creating container info FS $tmplvname ...\n";
}
else {
print "Mounting container info FS $tmplvname ...\n";
}
if (createExtraFS($INFOFS, $VGNAME, "${infosize}G")) {
TBScriptUnlock();
return -1;
}
if ($EXTRAFS =~ /\/(.*)$/) {
$tmplvname = $1;
}
my $already = 0;
if (!libvnode::lvExists($VGNAME,$tmplvname)) {
print "Creating scratch FS ...\n";
my $already = 0;
print "Creating scratch FS $tmplvname ...\n";
if (-d $EXTRAFS) {
$already = 1;
mysystem("mv $EXTRAFS ${EXTRAFS}.bak");
}
if (createExtraFS($EXTRAFS, $VGNAME, "${extrasize}G")) {
TBScriptUnlock();
return -1;
}
if ($already) {
my @files = glob("${EXTRAFS}.bak/*");
foreach my $file (@files) {
my $base = basename($file);
mysystem("/bin/mv $file $EXTRAFS")
if (! -e "$EXTRAFS/$base");
}
mysystem("/bin/rm -rf ${EXTRAFS}.bak");
}
else {
print "Mounting scratch FS $tmplvname ...\n";
}
if (createExtraFS($EXTRAFS, $VGNAME, "${extrasize}G")) {
TBScriptUnlock();
return -1;
}
if ($already) {
my @files = glob("${EXTRAFS}.bak/*");
foreach my $file (@files) {
my $base = basename($file);
mysystem("/bin/mv $file $EXTRAFS")
if (! -e "$EXTRAFS/$base");
}
mysystem("/bin/rm -rf ${EXTRAFS}.bak");
}
if ($USE_DOCKER_LVM && !libvnode::lvExists($VGNAME,"thinpool")) {
print "Creating Docker Thin Pool...\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