From: smbaker <smbaker@fc8clean.lan>
Date: Fri, 14 Dec 2012 19:32:56 +0000 (-0800)
Subject: some exception handling around the etc/passwd and etc/sudoers just to be safe
X-Git-Tag: nodemanager-2.1-17~1
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=017b153a7cfd73df8cbbc1b7ecbfd7def0a66d0d

some exception handling around the etc/passwd and etc/sudoers just to be safe
---

diff --git a/sliver_lxc.py b/sliver_lxc.py
index f1fe513..bdfd71d 100644
--- a/sliver_lxc.py
+++ b/sliver_lxc.py
@@ -163,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