proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-09 17:18:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Stéphane Graber 2015-01-22 11:54:46 -05:00
parent 3e73d66757
commit ce72f6b466
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/lxc/lxc-start-ephemeral.in
View File

@ -239,6 +239,7 @@ LXC_NAME="%s"
count = 0 count = 0
for entry in overlay_dirs: for entry in overlay_dirs:
tmpdir = "%s/tmpfs" % dest_path
deltdir = "%s/delta%s" % (tmpdir, count) deltdir = "%s/delta%s" % (tmpdir, count)
workdir = "%s/work%s" % (tmpdir, count) workdir = "%s/work%s" % (tmpdir, count)
fd.write("mkdir -p %s %s\n" % (deltdir, entry[1])) 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" % deltdir)
fd.write("mkdir %s\n" % workdir) 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 args.union_type == "overlayfs":
if have_new_overlay: if have_new_overlay:
fd.write("mount -n -t 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: else:
fd.write("mount -n -t overlayfs" 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": elif args.union_type == "aufs":
xino_path = "%s/lxc/aufs.xino" % get_rundir() xino_path = "%s/lxc/aufs.xino" % get_rundir()
if not os.path.exists(os.path.basename(xino_path)): if not os.path.exists(os.path.basename(xino_path)):