Skip to content

L
lxc
Commit ce72f6b4 by Stéphane Graber
Options

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

This defines a missing variable and re-indents the code a bit. Signed-off-by: 's avatarStéphane Graber <stgraber@ubuntu.com> Acked-by: 's avatarSerge E. Hallyn <serge.hallyn@ubuntu.com>
parent 3e73d667
Showing with 14 additions and 11 deletions
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)):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment