From 017b153a7cfd73df8cbbc1b7ecbfd7def0a66d0d Mon Sep 17 00:00:00 2001 From: smbaker Date: Fri, 14 Dec 2012 11:32:56 -0800 Subject: [PATCH] some exception handling around the etc/passwd and etc/sudoers just to be safe --- sliver_lxc.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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 -- 2.43.0