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

Support unprivileged ephemeral container using aufs

Browse Source 
As the commit 31a882e, 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: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
KATOH Yasufumi 2015-06-25 18:14:04 +09:00 committed by Stéphane Graber
parent b0c8058323
commit dc80aa9cb0
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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"
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))