Changeset 73e0a61 for fedkit


Ignore:
Timestamp:
Mar 5, 2010 1:59:52 PM (15 years ago)
Author:
Ted Faber <faber@…>
Branches:
axis_example, compt_changes, info-ops, master, version-3.01, version-3.02
Children:
e777dab
Parents:
593e901
Message:

PG works (w/o routing)

Location:
fedkit
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • fedkit/active_config.pl

    r593e901 r73e0a61  
    1818my $ssh = "/usr/bin/ssh";
    1919my $ssh_port = 22;
     20my $use_file;
    2021
    2122my %opts = (
  • fedkit/combo.pl

    r593e901 r73e0a61  
    5959        "--peer=$peer --ssh_pubkey=$ssh_pubkey --ssh_privkey=$ssh_privkey " .
    6060        " $tunnelparam --fedkit=$fedkit_dir --perl=$perl " .
    61         "--ssh=$ssh $portparam");
     61        "--ssh=$ssh --ssh_port=$ssh_port $portparam");
    6262    exit(20) if $?;
    6363}
  • fedkit/federate.pl

    r593e901 r73e0a61  
    3232my $proj;
    3333my $install_smb;
     34my $smb_type = 'cifs';
    3435chomp (my $uname = `uname`);
    3536my $smbmount = "smbmount.$uname.pl";
     
    5758    $from->close();
    5859    $to->close();
    59     # Now, bridging
     60    # Now, samba
    6061    system('/usr/bin/yum -y install samba-client');
     62    # These tools expect the fstab to include smbfs instead
     63    $smb_type = 'smbfs';
    6164}
    6265
     
    152155    if ($uname =~ /FreeBSD/ ) {
    153156        system("umount -A -f -t nfs,smbfs,cifs");
     157        $smb_type = "smbfs";
    154158    }
    155159    elsif ($uname =~ /Linux/ ) {
    156160        # Pass individual filestems to Linux umount.  No -A.
    157         my $mtab = new IO::File("/etc/mtab") || die "Can't open /etc/mtab:$1\n";
     161        my $mtab = new IO::File("/etc/mtab") || die "Can't open /etc/mtab:$!\n";
    158162        while (<$mtab>) {
    159163            chomp;
     
    169173    print "Mounting via SMB\n";
    170174    system("$perl /usr/local/federation/bin/$smbmount $smbshare $gateway " .
    171         "$smbuser $smbproject");
     175        "$smbuser $smbproject $smb_type");
    172176}
    173177
  • fedkit/smbmount.FreeBSD.pl

    r593e901 r73e0a61  
    1010$PUSER=shift || "jhickey";
    1111$PNAME=shift || "emulab-ops";
     12$FSTYPE=shift || "smbfs";
    1213$FSTAB="/etc/fstab";
    1314$HOMEROOT="/users";
     
    7576
    7677        print FSTAB "//$user\@$SHARE/$user\t";
    77         print FSTAB "$AMDROOT$homedir\tsmbfs\t";
     78        print FSTAB "$AMDROOT$homedir\t$FSTYPE\t";
    7879        print FSTAB "noauto,rw,-N,-f744,-d755,-u$uid,-g$gid\t0\t0\n";
    7980
     
    9091        if($user =~ m/$PUSER/i) {
    9192            print FSTAB "//$user\@$SHARE/proj-$PNAME\t";
    92             print FSTAB "$AMDROOT/proj\tsmbfs\t";
     93            print FSTAB "$AMDROOT/proj\t$FSTYPE\t";
    9394            print FSTAB "noauto,rw,-N,-f774,-d775,-u$uid,-g$gid\t0\t0\n";
    9495
     
    103104            if ( $share) {
    104105                print FSTAB "//$user\@$SHARE/share\t";
    105                 print FSTAB "$AMDROOT/share\tsmbfs\t";
     106                print FSTAB "$AMDROOT/share\t$FSTYPE\t";
    106107                print FSTAB "noauto,rw,-N,-f774,-d775,-u$uid,-g$gid\t0\t0\n";
    107108
  • fedkit/smbmount.Linux.pl

    r593e901 r73e0a61  
    1010$PUSER=shift || "jhickey";
    1111$PNAME=shift || "emulab-ops";
     12$FSTYPE=shift || 'cifs';
    1213$FSTAB="/etc/fstab";
    1314$HOMEROOT="/users";
     
    6869
    6970        print FSTAB "//$SHARE/$user\t";
    70         print FSTAB "$homedir\tcifs\t";
     71        print FSTAB "$homedir\t$FSTYPE\t";
    7172        print FSTAB "auto,rw,credentials=/tmp/$user.cifs_creds,ip=$ADDR\t0\t0\n";
    7273
     
    8687            if ( $share) {
    8788                print FSTAB "//$SHARE/share\t";
    88                 print FSTAB "/share\tcifs\t";
     89                print FSTAB "/share\t$FSTYPE\t";
    8990                print FSTAB "rw,credentials=/tmp/$user.cifs_creds,ip=$ADDR\t0\t0\n";
    9091
     
    9798close(FSTAB);
    9899
    99 print("Mounting the cifs versions of everything\n");
    100 system("$MOUNT -a -t cifs");
     100print("Mounting the $FSTYPE versions of everything\n");
     101system("$MOUNT -a -t $FSTYPE");
Note: See TracChangeset for help on using the changeset viewer.