Commit 3a7261ae authored by Leigh B. Stoller's avatar Leigh B. Stoller

Minor changes to how accounts are created during elabinelab initializaton

so that collab tool accounts get created.
parent 7eee7add
......@@ -2,7 +2,7 @@
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2005 University of Utah and the Flux Group.
# Copyright (c) 2000-2006 University of Utah and the Flux Group.
# All rights reserved.
#
use English;
......@@ -364,15 +364,15 @@ sub AddUser()
# And to the wiki if enabled.
system("$ADDWIKIUSER $user")
if ($WIKISUPPORT && !$batch && $user ne $PROTOUSER);
if ($WIKISUPPORT && $user ne $PROTOUSER);
# And to the bugdb if enabled.
system("$ADDBUGDBUSER $user")
if ($BUGDBSUPPORT && !$batch && $user ne $PROTOUSER);
if ($BUGDBSUPPORT && $user ne $PROTOUSER);
# And to the chat server if enabled.
system("$ADDCHATUSER $user")
if ($CHATSUPPORT && !$batch && $user ne $PROTOUSER);
if ($CHATSUPPORT && $user ne $PROTOUSER);
# And the mailman lists if enabled.
system("$ADDMMUSER $user")
......
......@@ -23,7 +23,7 @@ my $MINGID = @MIN_UNIX_GID@;
my $wap = '@prefix@/sbin/withadminprivs';
my $mkproj = '@prefix@/sbin/mkproj';
my $mkgroup = '@prefix@/sbin/mkgroup';
my $mkacct = '@prefix@/sbin/tbacct add';
my $mkacct = '@prefix@/sbin/tbacct';
my $protouser = 'elabman';
my $protouser_name = 'Emulab Manager';
......@@ -214,7 +214,7 @@ if (!defined($opts{u})) {
}
print "Running mkacct...\n";
if (system "$wap $mkacct $protouser") {
if (system "$wap $mkacct -b add $protouser") {
die "Unable to create account for initial user $protouser\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