Commit 0c667e78 authored by Mike Hibler's avatar Mike Hibler

A few more tweaks to get separate fs node install working again.

parent 3d20ba16
......@@ -257,13 +257,13 @@ elsif ($server eq "boss") {
elsif ($server eq "fs") {
@files = ('sperl', 'usersgroups', 'dirs',
'fs/ports', 'fs/portfix', 'ops/rcconf',
'etchosts', 'resolvetest', 'exports', 'quotas', 'sudoers',
'samba', 'ops/ssh');
'etchosts', 'resolvetest', 'ops/syslog', 'exports', 'quotas',
'sudoers', 'samba', 'ops/ssh');
}
elsif ($server eq "ops") {
@files = ('sperl', 'usersgroups', 'dirs', 'etchosts', 'resolvetest',
'ops/ports', 'ops/portfix', 'ops/patches', 'ops/rcconf',
'ops/sendmail', 'exports', 'nfsmounts', 'ops/syslog',
'ops/sendmail', 'ops/syslog', 'exports', 'nfsmounts',
'ops/crontab', 'sudoers', 'samba', 'ops/ssh', 'capture',
'ops/rcfiles', 'apache', 'ops/database', 'ops/mailman',
'ops/cvsd', 'ops/flyspray', 'ops/twiki');
......
......@@ -46,6 +46,13 @@ sub Install($$$)
elsif ($line =~ /^[^#].*$mpat/) {
$line =~ s/($mpat)/\;$LOGFACIL.none$1/;
}
#
# XXX get rid of any old pubsubd line(s)
# (should only happen on elabinelab nodes)
#
if ($line =~ /pubsubd/) {
$line =~ s/^/#/;
}
print SC $line;
}
close(SC);
......
......@@ -69,6 +69,12 @@ sub Install($$$)
push @exports_lines,
join(" ",@{$filesystems{$key}}) .
"\t$BOSSNODE -maproot=root";
# if not the ops node, must export to that node as well
if (!ISOPSNODE($server)) {
push @exports_lines,
join(" ",@{$filesystems{$key}}) .
"\t$USERNODE -maproot=root";
}
}
if (ISFS($server)) {
......@@ -80,6 +86,11 @@ sub Install($$$)
chomp($realdir);
push(@exports_lines,
"$realdir\t$BOSSNODE -maproot=root");
# if not the ops node, must export to that node as well
if (!ISOPSNODE($server)) {
push(@exports_lines,
"$realdir\t$USERNODE -maproot=root");
}
if (!$NOSHAREDFS) {
my ($a,$b,$c,$d) =
($CONTROL_NETWORK =~ /^(\d*)\.(\d*)\.(\d*)\.(\d*)/);
......
......@@ -64,6 +64,14 @@ sub Install($$$)
$line =~ s/^/#/;
}
#
# XXX get rid of any old pubsubd line(s)
# (should only happen on elabinelab nodes)
#
if ($line =~ /pubsubd/) {
$line =~ s/^/#/;
}
print SC $line;
#
......
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