Changeset 4e9719b for fedkit

Timestamp:

Mar 9, 2010 2:44:44 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

86a7bb8

Parents:

9b3627e

Message:

SEER stuff

Location:

fedkit

Files:

• prep_gateway.pl (modified) (2 diffs)
• smbmount.FreeBSD.pl (modified) (4 diffs)

fedkit/prep_gateway.pl

@@ -13 +13 @@
 my $peer;
 my $use_file;
+my $fed_dir = "/usr/local/federation/";
 my %opts = (
     'ssh_pubkey=s' => \$ssh_pubkey,
@@ -28 +29 @@
 my $uname = `uname`;
 chomp $uname;
+
+# on portals make sure client.conf is in the override position (in fed_dir).
+my $client_conf = gateway_lib::client_conf_filename();
+
+copy($client_conf, "$fed_dir/etc/client.conf") 
+    unless $client_conf =~ /^$fed_dir/;
 
 if ($uname =~ /Linux/) {

fedkit/smbmount.FreeBSD.pl

@@ -46 +46 @@
 open(TM, "/usr/local/federation/etc/userconf")or die("Failed to open userconf");
 open(CONFIG, ">/etc/nsmb.conf") or die("Failed to open /etc/nsmb.conf");
-open(MAP, ">$AMDMAP") or die("Failed to open $AMDMAP");
-open(PMAP, ">$PAMDMAP") or die("Failed to open $PAMDMAP");
+#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");
 
 print FSTAB "\n# SMB Configuration Generated by smbmount.pl\n";
-print MAP "# AMD Configuration Generated by smbmount.pl\n";
+#print MAP "# AMD Configuration Generated by smbmount.pl\n";
 print CONFIG "# SMB Configuration Generated by smbmount.pl\n\n";
 print CONFIG "[$SHARE]\naddr=$ADDR\n\n";
@@ -76 +76 @@
 
         print FSTAB "//$user\@$SHARE/$user\t";
-        print FSTAB "$AMDROOT$homedir\t$FSTYPE\t";
-        print FSTAB "noauto,rw,-N,-f744,-d755,-u$uid,-g$gid\t0\t0\n";
+        print FSTAB "$homedir\t$FSTYPE\t";
+        print FSTAB "rw,-N,-f744,-d755,-u$uid,-g$gid\t0\t0\n";
 
-        print MAP "\n$userlc type:=program;fs:=$AMDROOT$homedir;\\\n";
-        print MAP "mount:=\"$MOUNT mount $AMDROOT$homedir\";\\\n";
-        print MAP "unmount:=\"$UMOUNT unmount $AMDROOT$homedir\";";
+        #print MAP "\n$userlc type:=program;fs:=$AMDROOT$homedir;\\\n";
+        #print MAP "mount:=\"$MOUNT mount $AMDROOT$homedir\";\\\n";
+        #print MAP "unmount:=\"$UMOUNT unmount $AMDROOT$homedir\";";
 
         #
@@ -91 +91 @@
         if($user =~ m/$PUSER/i) {
             print FSTAB "//$user\@$SHARE/proj-$PNAME\t";
-            print FSTAB "$AMDROOT/proj\t$FSTYPE\t";
-            print FSTAB "noauto,rw,-N,-f774,-d775,-u$uid,-g$gid\t0\t0\n";
+            print FSTAB "/proj/$PNAME\t$FSTYPE\t";
+            print FSTAB "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";
+            #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") && 
+            if(! -d "/proj/$PNAME") {
+                    system("$MKDIR -p /proj/$PNAME") && 
                         die("Failed to make directory");
             }
             if ( $share) {
                 print FSTAB "//$user\@$SHARE/share\t";
-                print FSTAB "$AMDROOT/share\t$FSTYPE\t";
-                print FSTAB "noauto,rw,-N,-f774,-d775,-u$uid,-g$gid\t0\t0\n";
+                print FSTAB "/share\t$FSTYPE\t";
+                print FSTAB "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";
+                #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") && 
+                if(! -d "/share") {
+                        system("$MKDIR -p /share") && 
                             die("Failed to make directory");
                 }
@@ -122 +122 @@
 close(CONFIG);
 close(FSTAB);
-close(MAP);
-close(PMAP);
+print("Mounting the $FSTYPE versions of everything\n");
+system("$MOUNT -a -t $FSTYPE");
+#close(MAP);
+#close(PMAP);
 
-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");
+#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");