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>

lxc-start-ephemeral: fix pep-8 and pyflakes3
ce72f6b4 · Stéphane Graber · 3e73d667 · ce72f6b4
Commit ce72f6b4 authored Jan 22, 2015 by Stéphane Graber
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 11 deletions

lxc-start-ephemeral.in src/lxc/lxc-start-ephemeral.in +14 -11

No files found.
--- 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" %
-        fd.write("getfacl -a %s | setfacl --set-file=- %s || true\n" % (entry[0], entry[1]))
+                 (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" % (
+                         " -oupperdir=%s,lowerdir=%s,workdir=%s none %s\n" % (
-                         deltdir,
+                             deltdir,
-                         entry[0],
+                             entry[0],
-                         workdir,
+                             workdir,
-                         entry[1]))
+                             entry[1]))
            else:
                fd.write("mount -n -t overlayfs"
-                     " -oupperdir=%s,lowerdir=%s none %s\n" % (
+                         " -oupperdir=%s,lowerdir=%s none %s\n" % (
-                         deltdir,
+                             deltdir,
-                         entry[0],
+                             entry[0],
-                         entry[1]))
+                             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)):