mirror of
https://github.com/lxc/python2-lxc.git
synced 2026-02-05 18:48:35 +01:00
Don't require a template name
The template name isn't required, if it's not passed, then create will simply be asked to create a container without a rootfs. Signed-off-by: Chuck Short <chuck.short@canonical.com> Acked-by: Stéphane Graber <stgraber@ubuntu.com>
This commit is contained in:
committed by
Stéphane Graber
parent
4692193f7b
commit
227e22e876
2
lxc.c
2
lxc.c
@@ -729,7 +729,7 @@ Container_create(Container *self, PyObject *args, PyObject *kwds)
|
||||
int i = 0;
|
||||
static char *kwlist[] = {"template", "flags", "args", NULL};
|
||||
|
||||
if (! PyArg_ParseTupleAndKeywords(args, kwds, "s|iO", kwlist,
|
||||
if (! PyArg_ParseTupleAndKeywords(args, kwds, "|siO", kwlist,
|
||||
&template_name, &flags, &vargs))
|
||||
return NULL;
|
||||
|
||||
|
||||
@@ -201,11 +201,11 @@ class Container(_lxc.Container):
|
||||
|
||||
return _lxc.Container.set_config_item(self, key, value)
|
||||
|
||||
def create(self, template, flags=0, args=()):
|
||||
def create(self, template=None, flags=0, args=()):
|
||||
"""
|
||||
Create a new rootfs for the container.
|
||||
|
||||
"template" must be a valid template name.
|
||||
"template" if passed must be a valid template name.
|
||||
|
||||
"flags" (optional) is an integer representing the optional
|
||||
create flags to be passed.
|
||||
@@ -222,8 +222,13 @@ class Container(_lxc.Container):
|
||||
else:
|
||||
template_args = args
|
||||
|
||||
return _lxc.Container.create(self, template=template,
|
||||
flags=flags, args=tuple(template_args))
|
||||
if template:
|
||||
return _lxc.Container.create(self, template=template,
|
||||
flags=flags,
|
||||
args=tuple(template_args))
|
||||
else:
|
||||
return _lxc.Container.create(self, flags=flags,
|
||||
args=tuple(template_args))
|
||||
|
||||
def clone(self, newname, config_path=None, flags=0, bdevtype=None,
|
||||
bdevdata=None, newsize=0, hookargs=()):
|
||||
|
||||
Reference in New Issue
Block a user