X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_lxc.py;h=96b757fe126349e49295ccb40ade0ee7f1185861;hb=e95344dbfcbe31fbe1cb489d484e37c464950004;hp=7fcef281c5d8d7b87e82928f3e6f8747ee10ac52;hpb=834827443f52ebcf42f37664781e95a86f5c654b;p=nodemanager.git

diff --git a/sliver_lxc.py b/sliver_lxc.py
index 7fcef28..96b757f 100644
--- a/sliver_lxc.py
+++ b/sliver_lxc.py
@@ -87,7 +87,7 @@ class Sliver_LXC(Sliver_Libvirt, Initscript):
         # subvolume)
         command = ['btrfs', 'subvolume', 'snapshot', refImgDir, containerDir]
         if not logger.log_call(command, timeout=15*60):
-            logger.log('sliver_lxc: ERROR Could not create BTRFS snapshot at', containDir)
+            logger.log('sliver_lxc: ERROR Could not create BTRFS snapshot at', containerDir)
             return
         command = ['chmod', '755', containerDir]
         logger.log_call(command, timeout=15*60)
@@ -133,9 +133,6 @@ class Sliver_LXC(Sliver_Libvirt, Initscript):
         command = ['mkdir', '%s/root/.ssh'%containerDir]
         logger.log_call(command, timeout=10)
 
-        command = ['chown', name, '%s/root/.ssh'%containerDir]
-        logger.log_call(command, timeout=10)
-
         command = ['cp', '/home/%s/.ssh/id_rsa.pub'%name, '%s/root/.ssh/authorized_keys'%containerDir]
         logger.log_call(command, timeout=30)
 
@@ -166,10 +163,16 @@ class Sliver_LXC(Sliver_Libvirt, Initscript):
             etcpasswd = os.path.join(containerDir, 'etc/passwd')
             if os.path.exists(etcpasswd):
                 logger.log("adding user %s id %d to %s" % (name, uid, etcpasswd))
-                file(etcpasswd,'a').write("%s:x:%d:%d::/home/%s:/bin/bash\n" % (name, uid, uid, name))
+                try:
+                    file(etcpasswd,'a').write("%s:x:%d:%d::/home/%s:/bin/bash\n" % (name, uid, uid, name))
+                except:
+                    logger.log_exc("exception while updating etc/passwd")
             sudoers = os.path.join(containerDir, 'etc/sudoers')
             if os.path.exists(sudoers):
-                file(sudoers,'a').write("%s ALL=(ALL) NOPASSWD: ALL\n" % name)
+                try:
+                    file(sudoers,'a').write("%s ALL=(ALL) NOPASSWD: ALL\n" % name)
+                except:
+                    logger.log_exc("exception while updating /etc/sudoers")
 
         # Lookup for xid and create template after the user is created so we
         # can get the correct xid based on the name of the slice