- Timestamp:
- Mar 5, 2010 1:59:52 PM (15 years ago)
- Branches:
- axis_example, compt_changes, info-ops, master, version-3.01, version-3.02
- Children:
- e777dab
- Parents:
- 593e901
- Location:
- fedkit
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
fedkit/active_config.pl
r593e901 r73e0a61 18 18 my $ssh = "/usr/bin/ssh"; 19 19 my $ssh_port = 22; 20 my $use_file; 20 21 21 22 my %opts = ( -
fedkit/combo.pl
r593e901 r73e0a61 59 59 "--peer=$peer --ssh_pubkey=$ssh_pubkey --ssh_privkey=$ssh_privkey " . 60 60 " $tunnelparam --fedkit=$fedkit_dir --perl=$perl " . 61 "--ssh=$ssh $portparam");61 "--ssh=$ssh --ssh_port=$ssh_port $portparam"); 62 62 exit(20) if $?; 63 63 } -
fedkit/federate.pl
r593e901 r73e0a61 32 32 my $proj; 33 33 my $install_smb; 34 my $smb_type = 'cifs'; 34 35 chomp (my $uname = `uname`); 35 36 my $smbmount = "smbmount.$uname.pl"; … … 57 58 $from->close(); 58 59 $to->close(); 59 # Now, bridging60 # Now, samba 60 61 system('/usr/bin/yum -y install samba-client'); 62 # These tools expect the fstab to include smbfs instead 63 $smb_type = 'smbfs'; 61 64 } 62 65 … … 152 155 if ($uname =~ /FreeBSD/ ) { 153 156 system("umount -A -f -t nfs,smbfs,cifs"); 157 $smb_type = "smbfs"; 154 158 } 155 159 elsif ($uname =~ /Linux/ ) { 156 160 # 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"; 158 162 while (<$mtab>) { 159 163 chomp; … … 169 173 print "Mounting via SMB\n"; 170 174 system("$perl /usr/local/federation/bin/$smbmount $smbshare $gateway " . 171 "$smbuser $smbproject ");175 "$smbuser $smbproject $smb_type"); 172 176 } 173 177 -
fedkit/smbmount.FreeBSD.pl
r593e901 r73e0a61 10 10 $PUSER=shift || "jhickey"; 11 11 $PNAME=shift || "emulab-ops"; 12 $FSTYPE=shift || "smbfs"; 12 13 $FSTAB="/etc/fstab"; 13 14 $HOMEROOT="/users"; … … 75 76 76 77 print FSTAB "//$user\@$SHARE/$user\t"; 77 print FSTAB "$AMDROOT$homedir\t smbfs\t";78 print FSTAB "$AMDROOT$homedir\t$FSTYPE\t"; 78 79 print FSTAB "noauto,rw,-N,-f744,-d755,-u$uid,-g$gid\t0\t0\n"; 79 80 … … 90 91 if($user =~ m/$PUSER/i) { 91 92 print FSTAB "//$user\@$SHARE/proj-$PNAME\t"; 92 print FSTAB "$AMDROOT/proj\t smbfs\t";93 print FSTAB "$AMDROOT/proj\t$FSTYPE\t"; 93 94 print FSTAB "noauto,rw,-N,-f774,-d775,-u$uid,-g$gid\t0\t0\n"; 94 95 … … 103 104 if ( $share) { 104 105 print FSTAB "//$user\@$SHARE/share\t"; 105 print FSTAB "$AMDROOT/share\t smbfs\t";106 print FSTAB "$AMDROOT/share\t$FSTYPE\t"; 106 107 print FSTAB "noauto,rw,-N,-f774,-d775,-u$uid,-g$gid\t0\t0\n"; 107 108 -
fedkit/smbmount.Linux.pl
r593e901 r73e0a61 10 10 $PUSER=shift || "jhickey"; 11 11 $PNAME=shift || "emulab-ops"; 12 $FSTYPE=shift || 'cifs'; 12 13 $FSTAB="/etc/fstab"; 13 14 $HOMEROOT="/users"; … … 68 69 69 70 print FSTAB "//$SHARE/$user\t"; 70 print FSTAB "$homedir\t cifs\t";71 print FSTAB "$homedir\t$FSTYPE\t"; 71 72 print FSTAB "auto,rw,credentials=/tmp/$user.cifs_creds,ip=$ADDR\t0\t0\n"; 72 73 … … 86 87 if ( $share) { 87 88 print FSTAB "//$SHARE/share\t"; 88 print FSTAB "/share\t cifs\t";89 print FSTAB "/share\t$FSTYPE\t"; 89 90 print FSTAB "rw,credentials=/tmp/$user.cifs_creds,ip=$ADDR\t0\t0\n"; 90 91 … … 97 98 close(FSTAB); 98 99 99 print("Mounting the cifsversions of everything\n");100 system("$MOUNT -a -t cifs");100 print("Mounting the $FSTYPE versions of everything\n"); 101 system("$MOUNT -a -t $FSTYPE");
Note: See TracChangeset
for help on using the changeset viewer.