yellow team mailing list archive

[Gary Poster <gary.poster@xxxxxxxxxxxxx>]

Gary Poster has proposed merging lp:~yellow/launchpad/lxcsetup into lp:launchpad.

Requested reviews:
  Gary Poster (gary)

For more details, see:
https://code.launchpad.net/~yellow/launchpad/lxcsetup/+merge/97104

Remove usage of -b when calling lxc-start-ephemeral.  We do not need or want this argument now.
-- 
https://code.launchpad.net/~yellow/launchpad/lxcsetup/+merge/97104
Your team Launchpad Yellow Squad is subscribed to branch lp:~yellow/launchpad/lxcsetup.

=== modified file 'utilities/setuplxc.py'
--- utilities/setuplxc.py	2012-03-07 18:02:40 +0000
+++ utilities/setuplxc.py	2012-03-12 21:21:37 +0000
@@ -767,6 +767,7 @@
         'lxcname': lxcname,
         'ssh_key_path': ssh_key_path,
         'user': user,
+        'user_home': get_user_home(user),
         }
     # We need a script that will run the LP build inside LXC.  It is run as
     # root (see below) but drops root once inside the LXC container.
@@ -805,8 +806,8 @@
         script.write(textwrap.dedent(re.sub(' {2,}', ' ', """\
             #!/bin/sh
             set -uex
-            lxc-start-ephemeral -u {user} -S '{ssh_key_path}' -o {lxcname} \
-                -b $PWD -- "xvfb-run --error-file=/var/tmp/xvfb-errors.log \
+            lxc-start-ephemeral -u {user} -S '{ssh_key_path}' -o {lxcname} -- \
+                "xvfb-run --error-file=/var/tmp/xvfb-errors.log \
                 --server-args='-screen 0 1024x768x24' \
                 -a $PWD/bin/test --subunit $@"
             """).format(**mapping)))