Changeset 2b11a1d for fedkit

Timestamp:

Feb 22, 2010 7:59:13 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

db64553

Parents:

55779d4

Message:

allow mounting /share

Location:

fedkit

Files:

• smbmount.FreeBSD.pl (modified) (3 diffs)
• smbmount.Linux.pl (modified) (2 diffs)

fedkit/smbmount.FreeBSD.pl

@@ -26 +26 @@
 $KILLALL="/usr/bin/killall";
 $AMD="/usr/sbin/amd";
+
+my $share = 1;
 
 print "Killing amd.\n";
@@ -85 +87 @@
         # 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) {
@@ -101 +101 @@
                         die("Failed to make directory");
             }
+            if ( $share) {
+                print FSTAB "//$user\@$SHARE/share\t";
+                print FSTAB "$AMDROOT/share\tsmbfs\t";
+                print FSTAB "noauto,rw,-N,-f774,-d775,-u$uid,-g$gid\t0\t0\n";
+
+                print PMAP "$PNAME type:=program;fs:=$AMDROOT/share\\\n";
+                print PMAP "mount:=\"$MOUNT mount $AMDROOT/share\";\\\n";
+                print PMAP "unmount:=\"$UMOUNT unmount $AMDROOT/share\";\n";
+
+                if(! -d "$AMDROOT/share") {
+                        system("$MKDIR -p $AMDROOT/share") && 
+                            die("Failed to make directory");
+                }
+            }
         }
     }

fedkit/smbmount.Linux.pl

@@ -13 +13 @@
 $HOMEROOT="/users";
 $PROJROOT="/proj";
+
+my $share = 1;
 
 chomp $ADDR;
@@ -82 +84 @@
             print FSTAB "$PROJROOT/$PNAME\tcifs\t";
             print FSTAB "rw,credentials=/tmp/$user.cifs_creds,ip=$ADDR\t0\t0\n";
+            if ( $share) {
+                print FSTAB "//$SHARE/share\t";
+                print FSTAB "/share\tcifs\t";
+                print FSTAB "rw,credentials=/tmp/$user.cifs_creds,ip=$ADDR\t0\t0\n";
 
+                mkdir("/share") unless -d "/share";
+            }
         }
     }