Commit 9665fe1d authored by Mike Hibler's avatar Mike Hibler

Fixes for ops-as-a-jail case.

parent 21dac8ce
#!/usr/bin/perl -w
#
# Copyright (c) 2004-2012 University of Utah and the Flux Group.
# Copyright (c) 2004-2013 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -2576,7 +2576,11 @@ sub CreateOpsJail($)
# Need the package dir inside the jail.
mysystem("mkdir $OPSMOUNTDIR/packages") if (! -e "$OPSMOUNTDIR/packages");
mysystem("mount -t nullfs /packages $OPSMOUNTDIR/packages");
if (exists($emulabconfig{PACKAGE_TARBALL})) {
mysystem("mount -t nullfs $TBDIR/packages $OPSMOUNTDIR/packages");
} else {
mysystem("mount -t nullfs /packages $OPSMOUNTDIR/packages");
}
print "Copying over current testbed software into the jail\n";
mysystem("rsync -a --delete $TBDIR/src $OPSMOUNTDIR/$TBDIR");
......@@ -2653,7 +2657,11 @@ sub CreateOpsJail($)
print "Creating the ops node inside the jail\n";
# Use -d so output comes back to us.
mysystem("jexec -n ops '' $BINDIR/rc/rc.mkelab -d -j");
if ($FBSD_VERSION >= 8.2) {
mysystem("jexec -n ops $BINDIR/rc/rc.mkelab -d -j");
} else {
mysystem("jexec -n ops '' $BINDIR/rc/rc.mkelab -d -j");
}
}
#
......
......@@ -240,7 +240,7 @@ elsif ($server eq "boss") {
'apache', 'boss/rcfiles', 'boss/rcconf', 'boss/syslog',
'boss/database', 'etchosts', 'resolvetest',
'exports', 'nfsmounts', 'boss/mibs', 'boss/crontab', 'sudoers',
'boss/ssh', 'boss/hostkeys',
'samba', 'boss/ssh', 'boss/hostkeys',
'boss/rndc', 'boss/loaderconf', 'boss/sysctlconf',
'boss/sslcerts', 'boss/mailman', 'boss/pubsub',
'boss/software',
......
......@@ -38,6 +38,25 @@ sub Install($$$)
qq|apache_flags="-DSSL"|)),
qq|pubsubd_flags="-T 10"|);
# OPSVM
if (ISFS($server)) {
if ($WINSUPPORT) {
if ($FBSD_MAJOR > 8 || ($FBSD_MAJOR == 8 && $FBSD_MINOR > 2)) {
push(@strings, qq|samba_enable="YES"|);
push(@strings, qq|nmbd_enable="NO"|);
} else {
push(@strings, qq|smbd_enable="YES"|);
}
}
if ($QUOTA_FSLIST ne "") {
if ($FBSD_MAJOR > 8 || ($FBSD_MAJOR == 8 && $FBSD_MINOR > 2)) {
push(@strings, qq|quota_enable="YES"|);
} else {
push(@strings, qq|enable_quotas="YES"|);
}
}
}
# Starting at FreeBSD 6 we use the default version of bind, not the port.
if ($FBSD_MAJOR < 6) {
push(@strings, qq|named_enable="NO"|);
......
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