From: Scott Baker <smbaker@gmail.com>
Date: Fri, 30 Aug 2013 18:08:29 +0000 (-0700)
Subject: add --noslicehome option, and check /etc/lxcsu_default for default arguments
X-Git-Tag: lxc-userspace-1.0-7~1
X-Git-Url: http://git.onelab.eu/?p=lxc-userspace.git;a=commitdiff_plain;h=bc916290e9e64b040b6c063b733c5fc63efca7c6

add --noslicehome option, and check /etc/lxcsu_default for default arguments
---

diff --git a/lxcsu b/lxcsu
index 26c1e9d..c1ad9d1 100755
--- a/lxcsu
+++ b/lxcsu
@@ -47,8 +47,17 @@ def main ():
     parser.add_argument("-d","--debug",
                         action='store_true', dest='debug', default=False,
                         help="debug option")
-    parser.add_argument("-s","--nosliceuid", dest="nosliceuid", default=False,
+    parser.add_argument("-s","--nosliceuid",
+                        action='store_true', dest="nosliceuid", default=False,
                         help="do not change to slice uid inside of slice")
+    parser.add_argument("-o","--noslicehome",
+                        action='store_true', dest="noslicehome", default=False,
+                        help="do not change to slice home directory inside of slice")
+
+    if os.path.exists("/etc/lxcsu_default"):
+        defaults = parser.parse_args(file("/etc/lxcsu_default","r").read().split())
+        parser.set_defaults(**defaults.__dict__)
+
     parser.add_argument ("slice_name")
     parser.add_argument ("command_to_run",nargs="*")
 
@@ -240,10 +249,11 @@ def main ():
             exec_args = [arch,'/usr/sbin/capsh','--','--login']+args.command_to_run
 
         os.environ['SHELL'] = '/bin/sh'
-        os.environ['HOME'] = '/home/%s'%slice_name
         if os.path.exists('/etc/planetlab/lib/bind_public.so'):
             os.environ['LD_PRELOAD'] = '/etc/planetlab/lib/bind_public.so'
-        os.chdir("/home/%s"%(slice_name))
+        if not args.noslicehome:
+            os.environ['HOME'] = '/home/%s'%slice_name
+            os.chdir("/home/%s"%(slice_name))
         if debug: print 'lxcsu:execv:','/usr/bin/setarch',exec_args
         os.execv('/usr/bin/setarch',exec_args)
     else: