From: Stéphane Graber <stgraber@ubuntu.com>
Date: Thu, 22 Jan 2015 16:54:46 +0000 (-0500)
Subject: lxc-start-ephemeral: fix pep-8 and pyflakes3
X-Git-Tag: lxc-1.1.0.rc2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce72f6b466f714b4e7de912ed5546179ddf36a21;p=thirdparty%2Flxc.git

lxc-start-ephemeral: fix pep-8 and pyflakes3

This defines a missing variable and re-indents the code a bit.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/lxc-start-ephemeral.in b/src/lxc/lxc-start-ephemeral.in
index 66abe5623..b049f80ac 100644
--- a/src/lxc/lxc-start-ephemeral.in
+++ b/src/lxc/lxc-start-ephemeral.in
@@ -239,6 +239,7 @@ LXC_NAME="%s"
 
     count = 0
     for entry in overlay_dirs:
+        tmpdir = "%s/tmpfs" % dest_path
         deltdir = "%s/delta%s" % (tmpdir, count)
         workdir = "%s/work%s" % (tmpdir, count)
         fd.write("mkdir -p %s %s\n" % (deltdir, entry[1]))
@@ -250,23 +251,25 @@ LXC_NAME="%s"
             fd.write("mkdir %s\n" % deltdir)
             fd.write("mkdir %s\n" % workdir)
 
-        fd.write("getfacl -a %s | setfacl --set-file=- %s || true\n" % (entry[0], deltdir))
-        fd.write("getfacl -a %s | setfacl --set-file=- %s || true\n" % (entry[0], entry[1]))
+        fd.write("getfacl -a %s | setfacl --set-file=- %s || true\n" %
+                 (entry[0], deltdir))
+        fd.write("getfacl -a %s | setfacl --set-file=- %s || true\n" %
+                 (entry[0], entry[1]))
 
         if args.union_type == "overlayfs":
             if have_new_overlay:
                 fd.write("mount -n -t overlay"
-                     " -oupperdir=%s,lowerdir=%s,workdir=%s none %s\n" % (
-                         deltdir,
-                         entry[0],
-                         workdir,
-                         entry[1]))
+                         " -oupperdir=%s,lowerdir=%s,workdir=%s none %s\n" % (
+                             deltdir,
+                             entry[0],
+                             workdir,
+                             entry[1]))
             else:
                 fd.write("mount -n -t overlayfs"
-                     " -oupperdir=%s,lowerdir=%s none %s\n" % (
-                         deltdir,
-                         entry[0],
-                         entry[1]))
+                         " -oupperdir=%s,lowerdir=%s none %s\n" % (
+                             deltdir,
+                             entry[0],
+                             entry[1]))
         elif args.union_type == "aufs":
             xino_path = "%s/lxc/aufs.xino" % get_rundir()
             if not os.path.exists(os.path.basename(xino_path)):