Merge pull request #1943 from bhelm/master

[mirror_lxc.git] / src / lxc / tools / lxc_copy.c

diff --git a/src/lxc/tools/lxc_copy.c b/src/lxc/tools/lxc_copy.c
index 5a94de452ea230975096ee58b5cecccf08289b2a..403a2d4a8b2655deb6a2fb0f23319d76f635e87e 100644 (file)
--- a/src/lxc/tools/lxc_copy.c
+++ b/src/lxc/tools/lxc_copy.c
@@ -88,7 +88,7 @@ static const struct option my_longopts[] = {
 };
 
 /* mount keys */
-static char *const keys[] = {
+static char *const mount_keys[] = {
        [LXC_MNT_BIND] = "bind",
        [LXC_MNT_OVL] = "overlay",
        NULL
@@ -119,7 +119,7 @@ Options :\n\
   -t, --tmpfs               place ephemeral container on a tmpfs\n\
                             (WARNING: On reboot all changes made to the container will be lost.)\n\
   -L, --fssize              size of the new block device for block device containers\n\
-  -D, --keedata             pass together with -e start a persistent snapshot \n\
+  -D, --keepdata            pass together with -e start a persistent snapshot \n\
   -K, --keepname            keep the hostname of the original container\n\
   --  hook options          arguments passed to the hook program\n\
   -M, --keepmac             keep the MAC address of the original container\n\
@@ -574,7 +574,7 @@ static int my_parser(struct lxc_arguments *args, int c, char *arg)
                break;
        case 'm':
                subopts = optarg;
-               if (parse_mntsubopts(subopts, keys, mntparameters) < 0)
+               if (parse_mntsubopts(subopts, mount_keys, mntparameters) < 0)
                        return -1;
                break;
        case 'B':