Changeset f3691ff for fedkit/splitter.pl

Timestamp:

May 17, 2008 5:09:31 PM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02

Children:

387408b

Parents:

2396559e

Message:

checkpoint includes some ucb and some FC6 code

File:

• fedkit/splitter.pl (modified) (4 diffs)

fedkit/splitter.pl

@@ -9 +9 @@
 use File::Copy;
 
-my @scripts = ("fed_bootstrap", "federate.sh", "smbmount.pl", 
-    "make_hosts", "fed-tun.pl", "fed_evrepeater" );
+my @scripts = ("fed_bootstrap", "federate.sh", "smbmount.FreeBSD.pl", 
+    "smbmount.Linux.pl", "make_hosts", "fed-tun.pl", "fed_evrepeater",
+    "rc.accounts.patch");
 my $local_script_dir = ".";
 my($pid, $gid);                 # Process and group IDs for calling parse.tcl
@@ -492 +493 @@
 $project_user = $opts{'smbuser'} ||     # User to mount project dirs as
     die "Must give an SMB user\n";
-$auth_proj = $opts{'P'} || die "Must give an authentication project (-P)\n";
+$auth_proj = $opts{'P'};
 
 # tcl program to split experiments (changed during devel)
@@ -574 +575 @@
         # If this testbed has not had its access parameters read from fedd, try
         # to read them, if we have a way to talk to fedd
-        unless ($tbparams->{$tb}->{'access'} && $fedd_client) { 
+        unless ($tbparams->{$tb}->{'access'} || !$fedd_client) { 
             my $access_pipe = new IO::Pipe || 
                 die "Can't open pipe to fedd:$!\n";
+            my $proj = $auth_proj ? " -p $auth_proj " : "";
 
             print("Checking access to $tb using " . $tbparams->{$tb}->{'uri'}
@@ -583 +585 @@
             my $cmd = "$fedd_client -t " . 
                 $tbparams->{$tb}->{'uri'} .  " -T $ENV{HOME}/cacert.pem ".
-                "-l $tb -p $auth_proj | /usr/bin/tee fedd.$tb ";
+                "-l $tb $proj | /usr/bin/tee fedd.$tb ";
             print "$cmd\n" if $verbose;