X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_lxc.py;h=b3a9c7cea3156fb131f0c60e607e73b2c4b63b0a;hb=104607bf5c290276eb96072a2490ae90c60d27e3;hp=db6c6b806fc2ae452cccab29d219ccc592edcee9;hpb=ae83590e29098fe6e8425f67d830e832fee460e1;p=nodemanager.git

diff --git a/sliver_lxc.py b/sliver_lxc.py
index db6c6b8..b3a9c7c 100644
--- 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)
@@ -138,13 +138,14 @@ unset pathmunge
         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)
+            # 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)