Changeset 9d40cc9 for fedd/federation/emulab_segment.py

Timestamp:

Aug 26, 2012 1:04:57 PM (12 years ago)

Author:

ABDULLA ALWABEL <abdullaalwabel@…>

Branches:

master

Children:

2f45140

Parents:

d070d9f (diff), eb117fe (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​git://fedd.deterlab.net/fedd

File:

• fedd/federation/emulab_segment.py (modified) (2 diffs, 1 prop)

fedd/federation/emulab_segment.py

@@ -30 +30 @@
         # Configuration directories on the remote machine
         proj_dir = "/proj/%s/exp/%s/tmp" % (pid, eid)
-        softdir = "/proj/%s/software/%s" % (pid, eid)
+        softdir_root = "/proj/%s/software/" % pid
+        softdir = "%s/%s" % (softdir_root, eid)
         # Local software dir
         lsoftdir = "%s/software" % tmpdir
@@ -46 +47 @@
 
         # Script the filesystem changes
+        
+        # Set umask to 007.  Since we are operating
+        # within /proj, we want to permit all proj users
+        # read and write.  This is especially necessary
+        # since creating directory hierarchy (mkdir -p).
+        print >>scriptfile, "umask 007"
         print >>scriptfile, "/bin/rm -rf %s" % proj_dir
         # Clear and create the software directory
         print >>scriptfile, "/bin/rm -rf %s/*" % softdir
-        print >>scriptfile, 'mkdir -p %s' % proj_dir
+        print >>scriptfile, 'mkdir %s' % proj_dir
+        print >>scriptfile, 'chmod 0770 %s' % proj_dir
         if os.path.isdir(lsoftdir):
-            print >>scriptfile, 'mkdir -p %s' % softdir
+            print >>scriptfile, 'mkdir %s' % softdir_root
+            print >>scriptfile, 'chmod 0770 %s' % softdir_root
+            print >>scriptfile, 'mkdir %s' % softdir
             print >>scriptfile, 'chmod 0770 %s' % softdir
         print >>scriptfile, "rm -f %s" % scriptbase