change trigger script name

[nodemanager.git] / sliver_lxc.py

diff --git a/sliver_lxc.py b/sliver_lxc.py
index 40120c2..b3a9c7c 100644 (file)
--- a/sliver_lxc.py
+++ b/sliver_lxc.py
@@ -83,8 +83,8 @@ class Sliver_LXC(Sliver_Libvirt, Initscript):
 
         vref = rec['vref']
         if vref is None:
-            logger.log('sliver_libvirt: %s: WARNING - no vref attached defaults to lxc-f14' % (name))
             vref = "lxc-f14-x86_64"
+            logger.log("sliver_libvirt: %s: WARNING - no vref attached, using hard-wired default %s" % (name,vref))
 
         refImgDir    = os.path.join(Sliver_LXC.REF_IMG_BASE_DIR, vref)
         containerDir = os.path.join(Sliver_LXC.CON_BASE_DIR, name)
@@ -127,7 +127,7 @@ pathmunge /bin after
 pathmunge /sbin after
 unset pathmunge
 """
-        with open(dot_profile,'w') as f:
+        with open(pl_profile,'w') as f:
             f.write("export PS1='%s@\H \$ '\n"%(name))
             f.write("%s\n"%ld_preload_msg)
             f.write("export LD_PRELOAD=/etc/planetlab/lib/bind_public.so\n")
@@ -137,14 +137,15 @@ unset pathmunge
         # make sure this file is sourced from both root's and slice's .profile
         enforced_line = "[ -f /etc/planetlab.profile ] && source /etc/planetlab.profile\n"
         for path in [ 'root/.profile', 'home/%s/.profile'%name ]:
-            from_root=os.path,join(containerDir,path)
+            from_root=os.path.join(containerDir,path)
+            # if dir is not yet existing let's forget it for now
+            if not os.path.isdir(os.path.dirname(from_root)): continue
             found=False
             try: 
-                contents=file(from_root).readlnes()
+                contents=file(from_root).readlines()
                 for content in contents:
                     if content==enforced_line: found=True
-            except:
-                pass
+            except IOError: pass
             if not found:
                 with open(from_root,"a") as user_profile:
                     user_profile.write(enforced_line)