Changeset 30184e4

Timestamp:

Sep 27, 2007 1:53:16 PM (17 years ago)

Author:

John Hickey <jhickey@…>

Branches:

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

Children:

5166ad4

Parents:

45ed8ee

Message:

Fixed defaults to federation defaults (was working on code prior to teds
last checkin). Added working /proj mounts as well.

File:

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

fedkit/smbmount.pl

@@ -3 +3 @@
 #############################################################################
 # smbmounts.pl: Setup Automounter to mount via SMB for federated experiments
-# $Id: smbmount.pl,v 1.3 2007-09-27 02:50:14 jhickey Exp $
+# $Id: smbmount.pl,v 1.4 2007-09-27 20:53:16 jhickey Exp $
 #
 
-$ADDR="users.isi.deterlab.net";
-$TMCC="/usr/local/etc/emulab/tmcc";
-$SHARE="USERS";
+$SHARE=shift || "USERS";
+$ADDR=shift || `cat /usr/local/etc/emulab/bossnode`;
+$PUSER=shift || "jhickey";
+$PNAME=shift || "emulab-ops";
 $FSTAB="/etc/fstab";
 $HOMEROOT="/users";
+$PROJROOT="/proj";
 $AMDROOT="/auto";
 $AMDMAP="/etc/amd.users";
+$PAMDMAP="/etc/amd.proj";
 
+chomp $ADDR;
+
+$TMCC="/usr/local/etc/emulab/tmcc";
 $UMOUNT="/sbin/umount";
 $MOUNT="/sbin/mount";
@@ -36 +42 @@
 open(TM, "$TMCC accounts windows |") or die("Failed to execute TMCC");
 open(CONFIG, ">/etc/nsmb.conf") or die("Failed to open /etc/nsmb.conf");
-open(MAP, ">$AMDMAP") or die("Failed to open /etc/amd.users");
+open(MAP, ">$AMDMAP") or die("Failed to open $AMDMAP");
+open(PMAP, ">$PAMDMAP") or die("Failed to open $PAMDMAP");
 open(FSTAB,">>$FSTAB") or die("Cannot Open File $FSTAB");
 
@@ -70 +77 @@
                 print MAP "mount:=\"$MOUNT mount $AMDROOT$homedir\";\\\n";
                 print MAP "unmount:=\"$UMOUNT unmount $AMDROOT$homedir\";";
+
+                #
+                # If we are PUSER, the user assigned to mount the project directory,
+                # then we add in the mount for that.  The share is called proj-$PNAME
+                # where PNAME is the name of the project at the mothership.  We need
+                # a second map for this since we will be mounting under /proj.
+                # We should really not use share in federation.
+                #
+
+                if($user =~ m/$PUSER/i) {
+                        print FSTAB "//$user\@$SHARE/proj-$PNAME\t";
+                        print FSTAB "$AMDROOT/proj\tsmbfs\t";
+                        print FSTAB "noauto,rw,-N,-f774,-d775,-u$uid,-g$gid\t0\t0\n";
+
+                        print PMAP "$PNAME type:=program;fs:=$AMDROOT/proj;\\\n";
+                        print PMAP "mount:=\"$MOUNT mount $AMDROOT/proj\";\\\n";
+                        print PMAP "unmount:=\"$UMOUNT unmount $AMDROOT/proj\";\n";
+
+                        if(! -d "$AMDROOT/proj") {
+                                system("$MKDIR -p $AMDROOT/proj") && die("Failed to make directory");
+                        }
+                }
         }
 }
@@ -76 +105 @@
 close(FSTAB);
 close(MAP);
+close(PMAP);
 
-print "Starting the automounter: $AMD -l syslog -a $AMDROOT $HOMEROOT $AMDMAP\n";
-system("$AMD -l syslog -a $AMDROOT $HOMEROOT $AMDMAP") && die("Unable to start amd");
+print "Starting the automounter: $AMD -l syslog -a $AMDROOT $HOMEROOT $AMDMAP $PROJROOT $PAMDMAP\n";
+system("$AMD -l syslog -a $AMDROOT $HOMEROOT $AMDMAP $PROJROOT $PAMDMAP") && die("Unable to start amd");