Skip to content

L
lxc
Commit 58b46c0f by KATOH Yasufumi Committed by Stéphane Graber
Options

Support unprivileged ephemeral container using aufs

As the commit 31a882ef, an unprivileged container can use aufs. This patch removes the check for unpriv aufs, and change the path of xino file as an unprivileged user can mount aufs. Signed-off-by: 's avatarKATOH Yasufumi <karma@jazz.email.ne.jp> Acked-by: 's avatarSerge E. Hallyn <serge.hallyn@ubuntu.com>
parent ab94359c
Showing with 1 addition and 7 deletions
src/lxc/lxc-start-ephemeral.in
...@@ -120,12 +120,6 @@ parser.add_argument("--version", action="version", version=lxc.version) ...@@ -120,12 +120,6 @@ parser.add_argument("--version", action="version", version=lxc.version)
args = parser.parse_args() args = parser.parse_args()
# Basic requirements check
## We only support privileged containers for now
if os.geteuid() != 0 and args.union_type != "overlayfs":
parser.error(_("Unprivileged containers may only use "
"overlayfs at this time."))
## Check that -d and CMD aren't used at the same time ## Check that -d and CMD aren't used at the same time
if args.command and args.daemon: if args.command and args.daemon:
parser.error(_("You can't use -d and a command at the same time.")) parser.error(_("You can't use -d and a command at the same time."))
...@@ -269,7 +263,7 @@ LXC_NAME="%s" ...@@ -269,7 +263,7 @@ LXC_NAME="%s"
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 = "/dev/shm/aufs.xino"
if not os.path.exists(os.path.basename(xino_path)): if not os.path.exists(os.path.basename(xino_path)):
os.makedirs(os.path.basename(xino_path)) os.makedirs(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