From: Stéphane Graber <stgraber@ubuntu.com>
Date: Wed, 27 Mar 2013 13:27:43 +0000 (-0400)
Subject: lxc-start-ephemeral: Implement -n to match manpage
X-Git-Tag: lxc-0.9.0~1^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f63b1efdb4a94019df15a2a52dce039025d94819;p=thirdparty%2Flxc.git

lxc-start-ephemeral: Implement -n to match manpage

The -n/--name option of lxc-start-ephemeral was never implemented
even though it was documented in the manpage.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/lxc-start-ephemeral.in b/src/lxc/lxc-start-ephemeral.in
index 3e2a5d35b..d1bb6be45 100644
--- a/src/lxc/lxc-start-ephemeral.in
+++ b/src/lxc/lxc-start-ephemeral.in
@@ -70,6 +70,9 @@ parser.add_argument("--lxcpath", "-P", dest="lxcpath", metavar="PATH",
 parser.add_argument("--orig", "-o", type=str, required=True,
                     help=_("name of the original container"))
 
+parser.add_argument("--name", "-n", type=str,
+                    help=_("name of the target container"))
+
 parser.add_argument("--bdir", "-b", type=str,
                     help=_("directory to bind mount into container"))
 
@@ -117,7 +120,13 @@ if not args.lxcpath:
 else:
     lxc_path = args.lxcpath
 
-dest_path = tempfile.mkdtemp(prefix="%s-" % args.orig, dir=lxc_path)
+if args.name:
+    if os.path.exists("%s/%s" % (lxc_path, args.name)):
+        parser.error(_("A container named '%s' already exists." % args.name))
+    dest_path = "%s/%s" % (lxc_path, args.name)
+    os.mkdir(dest_path)
+else:
+    dest_path = tempfile.mkdtemp(prefix="%s-" % args.orig, dir=lxc_path)
 os.mkdir(os.path.join(dest_path, "rootfs"))
 
 # Setup the new container's configuration