Fix incomplete destruction of unprivileged ephemeral containers

If an unprivileged ephemeral container is started as follows, lxc-start-ephemeral -o trusty -n test_ephemeral Then an empty directory remains upon exit from the container, ~/.local/share/lxc/test_ephemeral/tmpfs/delta0 (The tmpfs filesystem is successfully unmounted, but we seem to lack permission to delete the delta0 directory). This issue arose following commits 4799a1e7 and dd2271e6 . The following patch resolves the issue. It has been tested on ubuntu 14.04 with the lxc-daily ppa. Since gmail screws up the formatting of the patch via line-wrapping etc, please copy the patch from the issue-tracker rather than from this email. Signed-off by: Oleg Freedholm <overlayfs@gmail.com> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

Fix incomplete destruction of unprivileged ephemeral containers
965ae331 · Stéphane Graber · 6147fe2e · 965ae331
Commit 965ae331 authored Apr 06, 2015 by Stéphane Graber
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

lxc-start-ephemeral.in src/lxc/lxc-start-ephemeral.in +3 -5

No files found.
--- a/src/lxc/lxc-start-ephemeral.in
+++ b/src/lxc/lxc-start-ephemeral.in
@@ -221,17 +221,15 @@ LXC_NAME="%s"
    count = 0
    for entry in overlay_dirs:
        tmpdir = "%s/tmpfs" % dest_path
+        fd.write("mkdir -p %s\n" % (tmpdir))
+        if args.storage_type == "tmpfs":
+            fd.write("mount -n -t tmpfs -o mode=0755 none %s\n" % (tmpdir))
        deltdir = "%s/delta%s" % (tmpdir, count)
        workdir = "%s/work%s" % (tmpdir, count)
        fd.write("mkdir -p %s %s\n" % (deltdir, entry[1]))
        if have_new_overlay:
            fd.write("mkdir -p %s\n" % workdir)
-        if args.storage_type == "tmpfs":
-            fd.write("mount -n -t tmpfs -o mode=0755 none %s\n" % (tmpdir))
-            fd.write("mkdir %s\n" % deltdir)
-            fd.write("mkdir %s\n" % workdir)
        if args.union_type == "overlayfs":
            if have_new_overlay:
                fd.write("mount -n -t overlay"