Changeset 73e0a6193bb39ba1940b34e0f91f4e323a49c6d2 for fedkit

Timestamp:

03/05/10 13:59:52 (2 years ago)

Author:

Ted Faber <faber@…>

Children:

e777dabd08800f1f56143a59fca05e237c6c10e4

Parents:

593e901c6f5948d13170376f94bcd56a297b7a62

git-committer:

Ted Faber <faber@isi.edu> / 2010-03-05T21:59:52Z+0000

Message:

PG works (w/o routing)

Location:

fedkit

Files:

• active_config.pl (modified) (1 diff)
• combo.pl (modified) (1 diff)
• federate.pl (modified) (4 diffs)
• smbmount.FreeBSD.pl (modified) (4 diffs)
• smbmount.Linux.pl (modified) (4 diffs)

fedkit/active_config.pl

@@ -18 +18 @@
 my $ssh = "/usr/bin/ssh";
 my $ssh_port = 22;
+my $use_file;
 
 my %opts = (

fedkit/combo.pl

@@ -59 +59 @@
         "--peer=$peer --ssh_pubkey=$ssh_pubkey --ssh_privkey=$ssh_privkey " .
         " $tunnelparam --fedkit=$fedkit_dir --perl=$perl " .
-        "--ssh=$ssh $portparam");
+        "--ssh=$ssh --ssh_port=$ssh_port $portparam");
     exit(20) if $?;
 }

fedkit/federate.pl

@@ -32 +32 @@
 my $proj;
 my $install_smb;
+my $smb_type = 'cifs';
 chomp (my $uname = `uname`);
 my $smbmount = "smbmount.$uname.pl";
@@ -57 +58 @@
     $from->close();
     $to->close();
-    # Now, bridging
+    # Now, samba
     system('/usr/bin/yum -y install samba-client');
+    # These tools expect the fstab to include smbfs instead
+    $smb_type = 'smbfs';
 }
 
@@ -152 +155 @@
     if ($uname =~ /FreeBSD/ ) {
         system("umount -A -f -t nfs,smbfs,cifs");
+        $smb_type = "smbfs";
     }
     elsif ($uname =~ /Linux/ ) {
         # Pass individual filestems to Linux umount.  No -A.
-        my $mtab = new IO::File("/etc/mtab") || die "Can't open /etc/mtab:$1\n";
+        my $mtab = new IO::File("/etc/mtab") || die "Can't open /etc/mtab:$!\n";
         while (<$mtab>) {
             chomp;
@@ -169 +173 @@
     print "Mounting via SMB\n";
     system("$perl /usr/local/federation/bin/$smbmount $smbshare $gateway " . 
-        "$smbuser $smbproject");
+        "$smbuser $smbproject $smb_type");
 }
 

fedkit/smbmount.FreeBSD.pl

@@ -10 +10 @@
 $PUSER=shift || "jhickey";
 $PNAME=shift || "emulab-ops";
+$FSTYPE=shift || "smbfs";
 $FSTAB="/etc/fstab";
 $HOMEROOT="/users";
@@ -75 +76 @@
 
         print FSTAB "//$user\@$SHARE/$user\t";
-        print FSTAB "$AMDROOT$homedir\tsmbfs\t";
+        print FSTAB "$AMDROOT$homedir\t$FSTYPE\t";
         print FSTAB "noauto,rw,-N,-f744,-d755,-u$uid,-g$gid\t0\t0\n";
 
@@ -90 +91 @@
         if($user =~ m/$PUSER/i) {
             print FSTAB "//$user\@$SHARE/proj-$PNAME\t";
-            print FSTAB "$AMDROOT/proj\tsmbfs\t";
+            print FSTAB "$AMDROOT/proj\t$FSTYPE\t";
             print FSTAB "noauto,rw,-N,-f774,-d775,-u$uid,-g$gid\t0\t0\n";
 
@@ -103 +104 @@
             if ( $share) {
                 print FSTAB "//$user\@$SHARE/share\t";
-                print FSTAB "$AMDROOT/share\tsmbfs\t";
+                print FSTAB "$AMDROOT/share\t$FSTYPE\t";
                 print FSTAB "noauto,rw,-N,-f774,-d775,-u$uid,-g$gid\t0\t0\n";
 

fedkit/smbmount.Linux.pl

@@ -10 +10 @@
 $PUSER=shift || "jhickey";
 $PNAME=shift || "emulab-ops";
+$FSTYPE=shift || 'cifs';
 $FSTAB="/etc/fstab";
 $HOMEROOT="/users";
@@ -68 +69 @@
 
         print FSTAB "//$SHARE/$user\t";
-        print FSTAB "$homedir\tcifs\t";
+        print FSTAB "$homedir\t$FSTYPE\t";
         print FSTAB "auto,rw,credentials=/tmp/$user.cifs_creds,ip=$ADDR\t0\t0\n";
 
@@ -86 +87 @@
             if ( $share) {
                 print FSTAB "//$SHARE/share\t";
-                print FSTAB "/share\tcifs\t";
+                print FSTAB "/share\t$FSTYPE\t";
                 print FSTAB "rw,credentials=/tmp/$user.cifs_creds,ip=$ADDR\t0\t0\n";
 
@@ -97 +98 @@
 close(FSTAB);
 
-print("Mounting the cifs versions of everything\n");
-system("$MOUNT -a -t cifs");
+print("Mounting the $FSTYPE versions of everything\n");
+system("$MOUNT -a -t $FSTYPE");