Commit 5aa38356 authored by Jonathon Duerig's avatar Jonathon Duerig
Browse files

Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel

parents 449c336a d28037ec
/*
* EMULAB-COPYRIGHT
* Copyright (c) 2000-2009 University of Utah and the Flux Group.
* Copyright (c) 2000-2010 University of Utah and the Flux Group.
* All rights reserved.
*/
......@@ -853,7 +853,7 @@ int main(int argc,char **argv) {
char* delims = "/";
char* flags = "s:v:l:t:rpPTdH:oguc:nx:y:W:FDf:";
#else
char* flags = "s:v:l:t:rpPTdH:oguc:nx:y:FD"
char* flags = "s:v:l:t:rpPTdH:oguc:nx:y:FD";
#endif
while ((ch = getopt(argc,argv,flags)) != -1) {
......
......@@ -298,6 +298,7 @@ sub AUTOLOAD {
}
sub dbrow($$) { return $_[0]->{'EXPT'}; }
sub locked($) { return $_[0]->expt_locked(); }
sub elabinelab($) { return $_[0]->elab_in_elab(); }
sub description($){ return $_[0]->expt_name(); }
sub creator($) { return $_[0]->expt_head_uid(); }
sub created($) { return $_[0]->expt_created(); }
......
......@@ -484,8 +484,16 @@ Phase "samba", "Setting up Samba", sub {
};
if ($ELABINELAB) {
Phase "starting", "Starting Samba", sub {
my $sscript;
if (-x "$RCDIR/samba.sh") {
$sscript = "samba.sh";
} elsif (-x "$RCDIR/samba") {
$sscript = "samba";
} else {
PhaseFail("No samba startup script!?");
}
DoneIfExists("$VARRUN/smbd.pid");
ExecQuietFatal("$RCDIR/samba.sh start");
ExecQuietFatal("$RCDIR/$sscript start");
};
}
};
......
......@@ -763,13 +763,16 @@ Phase "NFSmounts", "Setting up NFS mounts", sub {
};
Phase "fstab", "Adding NFS mounts to $FSTAB", sub {
DoneIfEdited($FSTAB);
my @lines = ("$FSNODE:$USERROOT\t\t$USERROOT\tnfs\trw,nodev,nosuid\t0\t0",
"$FSNODE:$PROJROOT\t\t$PROJROOT\tnfs\trw,nodev,nosuid\t0\t0",
"$FSNODE:$GROUPROOT\t\t$GROUPROOT\tnfs\trw,nodev,nosuid\t0\t0",
"$FSNODE:$SHAREROOT\t\t$SHAREROOT\tnfs\trw,nodev,nosuid\t0\t0");
my $nfsopt = "nosuid";
$nfsopt .= ",nodev"
if ($FBSD_MAJOR < 7);
my @lines = ("$FSNODE:$USERROOT\t\t$USERROOT\tnfs\trw,$nfsopt\t0\t0",
"$FSNODE:$PROJROOT\t\t$PROJROOT\tnfs\trw,$nfsopt\t0\t0",
"$FSNODE:$GROUPROOT\t\t$GROUPROOT\tnfs\trw,$nfsopt\t0\t0",
"$FSNODE:$SHAREROOT\t\t$SHAREROOT\tnfs\trw,$nfsopt\t0\t0");
if ($SCRATCHDIR) {
push(@lines,
"$FSNODE:$SCRATCHROOT\t\t$SCRATCHROOT\tnfs\trw,nodev,nosuid\t0\t0");
"$FSNODE:$SCRATCHROOT\t\t$SCRATCHROOT\tnfs\trw,$nfsopt\t0\t0");
}
AppendToFileFatal($FSTAB, @lines);
......
......@@ -49,9 +49,20 @@ if [ ! -d $dir/nfsdump2 ]; then
echo "ERROR: nfsdump2-install: patch failed"
exit 1
}
#
# XXX link in the local additions
# Note hack to deal with relative paths...argh!
#
pre=""
case $srcdir in
/*)
;;
*)
pre="../"
;;
esac
for f in `ls $srcdir/files/*`; do
ln -sf $f nfsdump2/
ln -sf $pre$f nfsdump2/
done
rm -f nfsdump2/*.orig
fi
......
......@@ -1824,6 +1824,7 @@ CREATE TABLE `login` (
`hashhash` varchar(64) NOT NULL default '',
`timeout` varchar(10) NOT NULL default '',
`adminon` tinyint(1) NOT NULL default '0',
`opskey` varchar(64) NOT NULL,
PRIMARY KEY (`uid_idx`,`hashkey`),
UNIQUE KEY `hashhash` (`uid_idx`,`hashhash`),
UNIQUE KEY `uidkey` (`uid`,`hashkey`)
......
......@@ -5,8 +5,8 @@
-- these is not idempotent, since a site may have changed them for some reason.
--
INSERT IGNORE INTO `node_types` VALUES ('pcvm','pcvm',NULL,NULL,1,0,1,1,0,0,0,0,0,0,0);
INSERT IGNORE INTO `node_types` VALUES ('pcvwa','pcvwa',NULL,NULL,1,0,0,1,1,0,0,0,0,0,0);
INSERT IGNORE INTO `node_types` VALUES ('pcvm','pcvm',NULL,NULL,1,0,1,1,0,0,0,0,0,0,0,0);
INSERT IGNORE INTO `node_types` VALUES ('pcvwa','pcvwa',NULL,NULL,1,0,0,1,1,0,0,0,0,0,0,0);
INSERT IGNORE INTO `node_type_attributes` VALUES ('pcvwa','default_osid','0','integer');
INSERT IGNORE INTO os_boot_cmd VALUES ('FreeBSD','4.10','delay','/kernel.delay');
......
......@@ -56,10 +56,10 @@ INSERT INTO sitevariables VALUES ('robotlab/opentime','08:00','07:00','Time the
INSERT INTO sitevariables VALUES ('robotlab/closetime',NULL,'18:00','Time the Robot lab closes down for the night.',0);
INSERT INTO sitevariables VALUES ('robotlab/open','1','0','Turn the Robot Lab on/off for weekends and holidays. Overrides the open/close times.',0);
INSERT INTO sitevariables VALUES ('swap/admission_control_debug',NULL,'0','Turn on/off admission control debugging (lots of output!)',0);
INSERT INTO sitevariables VALUES ('elabinelab/boss_pkg',NULL,'','Name of boss node install package (DEPRECATED)',0);
INSERT INTO sitevariables VALUES ('elabinelab/boss_pkg_dir',NULL,'','Path from which to fetch boss packages (DEPRECATED)',0);
INSERT INTO sitevariables VALUES ('elabinelab/ops_pkg',NULL,'','Name of ops node install package (DEPRECATED)',0);
INSERT INTO sitevariables VALUES ('elabinelab/ops_pkg_dir',NULL,'','Path from which to fetch ops packages (DEPRECATED)',0);
INSERT INTO sitevariables VALUES ('elabinelab/boss_pkg',NULL,'emulab-boss-1.8','Name of boss node install package (DEPRECATED)',0);
INSERT INTO sitevariables VALUES ('elabinelab/boss_pkg_dir',NULL,'/share/freebsd/packages/FreeBSD-4.10-20041102','Path from which to fetch boss packages (DEPRECATED)',0);
INSERT INTO sitevariables VALUES ('elabinelab/ops_pkg',NULL,'emulab-ops-1.4','Name of ops node install package (DEPRECATED)',0);
INSERT INTO sitevariables VALUES ('elabinelab/ops_pkg_dir',NULL,'/share/freebsd/packages/FreeBSD-4.10-20041102','Path from which to fetch ops packages (DEPRECATED)',0);
INSERT INTO sitevariables VALUES ('elabinelab/windows','1','0','Turn on Windows support in inner Emulab',0);
INSERT INTO `sitevariables` VALUES ('elabinelab/singlenet',NULL,'0','Default control net config. 0==use inner cnet, 1==use real cnet',1);
INSERT INTO `sitevariables` VALUES ('elabinelab/boss_osid',NULL,'','Default (emulab-ops) OSID to boot on boss node. Empty string means use node_type default OSID',1);
......
#
# exp-vis
#
use strict;
use libdb;
sub DoUpdate($$$)
{
my ($dbhandle, $dbname, $version) = @_;
if (!DBSlotExists("login", "opskey")) {
DBQueryFatal("ALTER TABLE login ADD COLUMN ".
" `opskey` varchar(64) NOT NULL ".
" after adminon");
}
return 0;
}
1;
Supports Markdown
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