confile: lxc.net.ipv6 --> lxc.net.ipv6.address

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/README.md b/README.md
index dd03a298b9ae0a6033561a5b4b994db205c66a42..9ebcf07dde5ed103ff757ee8ecd94a1e62f1e27a 100644 (file)
--- a/README.md
+++ b/README.md
@@ -84,8 +84,8 @@ LXC is configured via a simple set of keys. For example,
 
 LXC namespaces configuration keys by using single dots. This means complex
 configuration keys such as `lxc.net.0` expose various subkeys such as
-`lxc.net.0.type`, `lxc.net.0.link`, `lxc.net.0.ipv6`, and others for even
-more fine-grained configuration.
+`lxc.net.0.type`, `lxc.net.0.link`, `lxc.net.0.ipv6.address`, and others for
+even more fine-grained configuration.
 
 LXC is used as the default runtime for [LXD](https://github.com/lxc/lxd),
 a container hypervisor exposing a well-designed and stable REST-api on top of

diff --git a/doc/examples/lxc-complex.conf.in b/doc/examples/lxc-complex.conf.in
index f78e66f063e5acb43f82775141b804fa2e200229..d7ba6464ed2126c6da3387d1942119685f547905 100644 (file)
--- a/doc/examples/lxc-complex.conf.in
+++ b/doc/examples/lxc-complex.conf.in
@@ -6,18 +6,18 @@ lxc.net.0.flags = up
 lxc.net.0.link = br0
 lxc.net.0.hwaddr = 4a:49:43:49:79:bf
 lxc.net.0.ipv4.address = 10.2.3.5/24
-lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3597
+lxc.net.0.ipv6.address = 2003:db8:1:0:214:1234:fe0b:3597
 
 lxc.net.0.type = macvlan
 lxc.net.0.flags = up
 lxc.net.0.link = eth0
 lxc.net.0.hwaddr = 4a:49:43:49:79:bd
 lxc.net.0.ipv4.address = 10.2.3.4/24
-lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596
+lxc.net.0.ipv6.address = 2003:db8:1:0:214:1234:fe0b:3596
 
 lxc.net.0.type = phys
 lxc.net.0.flags = up
 lxc.net.0.link = dummy0
 lxc.net.0.hwaddr = 4a:49:43:49:79:ff
 lxc.net.0.ipv4.address = 10.2.3.6/24
-lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3297
+lxc.net.0.ipv6.address = 2003:db8:1:0:214:1234:fe0b:3297

diff --git a/doc/examples/lxc-macvlan.conf.in b/doc/examples/lxc-macvlan.conf.in
index 2c78cba4d0251ad7fdbf0979a108062c939d8108..8831b11a236570f209b467a11fd92493ec2ee21e 100644 (file)
--- a/doc/examples/lxc-macvlan.conf.in
+++ b/doc/examples/lxc-macvlan.conf.in
@@ -5,4 +5,4 @@ lxc.net.0.flags = up
 lxc.net.0.link = eth0
 lxc.net.0.hwaddr = 4a:49:43:49:79:bd
 lxc.net.0.ipv4.address = 10.2.3.4/24
-lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596
+lxc.net.0.ipv6.address = 2003:db8:1:0:214:1234:fe0b:3596

diff --git a/doc/examples/lxc-phys.conf.in b/doc/examples/lxc-phys.conf.in
index 73b977b625d6a9b6f86caa613fc8208b98c61c72..39e96667a32ebd5544df6d7fa64b42ffe1cad59f 100644 (file)
--- a/doc/examples/lxc-phys.conf.in
+++ b/doc/examples/lxc-phys.conf.in
@@ -6,4 +6,4 @@ lxc.net.0.flags = up
 lxc.net.0.link = eth0
 lxc.net.0.hwaddr = 4a:49:43:49:79:ff
 lxc.net.0.ipv4.address = 10.2.3.6/24
-lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3297
+lxc.net.0.ipv6.address = 2003:db8:1:0:214:1234:fe0b:3297

diff --git a/doc/examples/lxc-veth.conf.in b/doc/examples/lxc-veth.conf.in
index d4fdb9020c07471d6011a13429322fdd7cf6f843..044b02c7d789693f9c79101c57a57d64db0d755f 100644 (file)
--- a/doc/examples/lxc-veth.conf.in
+++ b/doc/examples/lxc-veth.conf.in
@@ -6,4 +6,4 @@ lxc.net.0.flags = up
 lxc.net.0.link = br0
 lxc.net.0.hwaddr = 4a:49:43:49:79:bf
 lxc.net.0.ipv4.address = 10.2.3.5/24
-lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3597
+lxc.net.0.ipv6.address = 2003:db8:1:0:214:1234:fe0b:3597

diff --git a/doc/examples/lxc-vlan.conf.in b/doc/examples/lxc-vlan.conf.in
index 2d900f8c290ea77ece6dffda971b36e1c1aab2a7..b2406e0b215b285c70ba7fac4c9c333c543b9bab 100644 (file)
--- a/doc/examples/lxc-vlan.conf.in
+++ b/doc/examples/lxc-vlan.conf.in
@@ -6,4 +6,4 @@ lxc.net.0.flags = up
 lxc.net.0.link = eth0
 lxc.net.0.hwaddr = 4a:49:43:49:79:bd
 lxc.net.0.ipv4.address = 10.2.3.4/24
-lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596
+lxc.net.0.ipv6.address = 2003:db8:1:0:214:1234:fe0b:3596

diff --git a/doc/lxc.container.conf b/doc/lxc.container.conf
index 174df79491c7c626a8c66819140ac0396260153f..8d8fc84e1ce7b0ee9abd3b4b5ae955da02494b7f 100644 (file)
--- a/doc/lxc.container.conf
+++ b/doc/lxc.container.conf
@@ -32,5 +32,5 @@ lxc.net.0.ipv4.address = 1.2.3.5/24
 
 # specify the ipv6 address of the container. Several lines are allowed and
 # will mean several addresses will be assigned to the interface
-lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596
+lxc.net.0.ipv6.address = 2003:db8:1:0:214:1234:fe0b:3596
 

diff --git a/doc/lxc.container.conf.sgml.in b/doc/lxc.container.conf.sgml.in
index 0771703898b83472f5ed1cc603e11023dc183a9e..9a1b233c04041c8d832d258ed4e876c634499e05 100644 (file)
--- a/doc/lxc.container.conf.sgml.in
+++ b/doc/lxc.container.conf.sgml.in
@@ -102,7 +102,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
       LXC namespaces configuration keys by using single dots. This means complex
       configuration keys such as <option>lxc.net.0</option> expose various
       subkeys such as <option>lxc.net.0.type</option>,
-      <option>lxc.net.0.link</option>, <option>lxc.net.0.ipv6</option>, and
+      <option>lxc.net.0.link</option>, <option>lxc.net.0.ipv6.address</option>, and
       others for even more fine-grained configuration.
     </para>
 
@@ -557,7 +557,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
         <varlistentry>
           <term>
-            <option>lxc.net.[i].ipv6</option>
+            <option>lxc.net.[i].ipv6.address</option>
           </term>
           <listitem>
             <para>
@@ -1925,7 +1925,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
         lxc.net.0.name = eth0
         lxc.net.0.hwaddr = 4a:49:43:49:79:bf
         lxc.net.0.ipv4.address = 10.2.3.5/24 10.2.3.255
-        lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3597
+        lxc.net.0.ipv6.address = 2003:db8:1:0:214:1234:fe0b:3597
       </programlisting>
     </refsect2>
 
@@ -1967,21 +1967,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
         lxc.net.0.link = br0
         lxc.net.0.hwaddr = 4a:49:43:49:79:bf
         lxc.net.0.ipv4.address = 10.2.3.5/24 10.2.3.255
-        lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3597
-        lxc.net.0.ipv6 = 2003:db8:1:0:214:5432:feab:3588
+        lxc.net.0.ipv6.address = 2003:db8:1:0:214:1234:fe0b:3597
+        lxc.net.0.ipv6.address = 2003:db8:1:0:214:5432:feab:3588
         lxc.net.1.type = macvlan
         lxc.net.1.flags = up
         lxc.net.1.link = eth0
         lxc.net.1.hwaddr = 4a:49:43:49:79:bd
         lxc.net.1.ipv4.address = 10.2.3.4/24
         lxc.net.1.ipv4.address = 192.168.10.125/24
-        lxc.net.1.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596
+        lxc.net.1.ipv6.address = 2003:db8:1:0:214:1234:fe0b:3596
         lxc.net.2.type = phys
         lxc.net.2.flags = up
         lxc.net.2.link = dummy0
         lxc.net.2.hwaddr = 4a:49:43:49:79:ff
         lxc.net.2.ipv4.address = 10.2.3.6/24
-        lxc.net.2.ipv6 = 2003:db8:1:0:214:1234:fe0b:3297
+        lxc.net.2.ipv6.address = 2003:db8:1:0:214:1234:fe0b:3297
         lxc.cgroup.cpuset.cpus = 0,1
         lxc.cgroup.cpu.shares = 1234
         lxc.cgroup.devices.deny = a

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 9f322f8d3ad2cdfb20a95d1aed4a1392789fbeac..c218e032941cb6ff691387efbd9ea3396a68d53d 100644 (file)
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -107,7 +107,7 @@ lxc_config_define(net_ipv4_address);
 lxc_config_define(net_ipv4_gateway);
 lxc_config_define(net_script_up);
 lxc_config_define(net_script_down);
-lxc_config_define(net_ipv6);
+lxc_config_define(net_ipv6_address);
 lxc_config_define(net_ipv6_gateway);
 lxc_config_define(net_nic);
 lxc_config_define(net);
@@ -231,7 +231,7 @@ static struct lxc_config_t config[] = {
        { "lxc.net.ipv4.gateway",          set_config_net_ipv4_gateway,            get_config_net_ipv4_gateway,            clr_config_net_ipv4_gateway,          },
        { "lxc.net.ipv4.address",          set_config_net_ipv4_address,            get_config_net_ipv4_address,            clr_config_net_ipv4_address,          },
        { "lxc.net.ipv6.gateway",          set_config_net_ipv6_gateway,            get_config_net_ipv6_gateway,            clr_config_net_ipv6_gateway,          },
-       { "lxc.net.ipv6",                  set_config_net_ipv6,                    get_config_net_ipv6,                    clr_config_net_ipv6,                  },
+       { "lxc.net.ipv6.address",          set_config_net_ipv6_address,            get_config_net_ipv6_address,            clr_config_net_ipv6_address,          },
        { "lxc.net.",                      set_config_net_nic,                     get_config_net_nic,                     clr_config_net_nic,                   },
        { "lxc.net",                       set_config_net,                         get_config_net,                         clr_config_net,                       },
        { "lxc.cap.drop",                  set_config_cap_drop,                    get_config_cap_drop,                    clr_config_cap_drop,                  },
@@ -519,7 +519,7 @@ extern int lxc_list_nicconfigs(struct lxc_conf *c, const char *key, char *retv,
                strprint(retv, inlen, "name\n");
                strprint(retv, inlen, "hwaddr\n");
                strprint(retv, inlen, "mtu\n");
-               strprint(retv, inlen, "ipv6\n");
+               strprint(retv, inlen, "ipv6.address\n");
                strprint(retv, inlen, "ipv6.gateway\n");
                strprint(retv, inlen, "ipv4.address\n");
                strprint(retv, inlen, "ipv4.gateway\n");
@@ -893,8 +893,8 @@ static int set_config_net_ipv4_gateway(const char *key, const char *value,
        return 0;
 }
 
-static int set_config_net_ipv6(const char *key, const char *value,
-                              struct lxc_conf *lxc_conf, void *data)
+static int set_config_net_ipv6_address(const char *key, const char *value,
+                                      struct lxc_conf *lxc_conf, void *data)
 {
        struct lxc_netdev *netdev;
        struct lxc_inet6dev *inet6dev;
@@ -902,7 +902,7 @@ static int set_config_net_ipv6(const char *key, const char *value,
        char *slash, *valdup, *netmask;
 
        if (lxc_config_value_empty(value))
-               return clr_config_net_ipv6(key, lxc_conf, data);
+               return clr_config_net_ipv6_address(key, lxc_conf, data);
 
        if (!data)
                return -1;
@@ -4059,8 +4059,8 @@ static int clr_config_net_ipv6_gateway(const char *key,
        return 0;
 }
 
-static int clr_config_net_ipv6(const char *key, struct lxc_conf *lxc_conf,
-                              void *data)
+static int clr_config_net_ipv6_address(const char *key,
+                                      struct lxc_conf *lxc_conf, void *data)
 {
        struct lxc_netdev *netdev;
        struct lxc_list *cur, *next;
@@ -4479,8 +4479,8 @@ static int get_config_net_ipv6_gateway(const char *key, char *retv, int inlen,
        return fulllen;
 }
 
-static int get_config_net_ipv6(const char *key, char *retv, int inlen,
-                              struct lxc_conf *c, void *data)
+static int get_config_net_ipv6_address(const char *key, char *retv, int inlen,
+                                      struct lxc_conf *c, void *data)
 {
        int len, fulllen = 0;
        size_t listlen;

diff --git a/src/tests/parse_config_file.c b/src/tests/parse_config_file.c
index bffff0e797c3a0b731ca380cb8d038a034ceeab7..f3d47299471710291bc2322ad977d7953b4b18ca 100644 (file)
--- a/src/tests/parse_config_file.c
+++ b/src/tests/parse_config_file.c
@@ -105,15 +105,15 @@ static int set_and_clear_complete_netdev(struct lxc_container *c)
                return -1;
        }
 
-       if (!c->set_config_item(c, "lxc.net.1.ipv6",
+       if (!c->set_config_item(c, "lxc.net.1.ipv6.address",
                                "2003:db8:1:0:214:1234:fe0b:3596/64")) {
-               lxc_error("%s\n", "lxc.net.1.ipv6");
+               lxc_error("%s\n", "lxc.net.1.ipv6.address");
                return -1;
        }
 
-       if (!c->set_config_item(c, "lxc.net.1.ipv6_gateway",
+       if (!c->set_config_item(c, "lxc.net.1.ipv6.gateway",
                                "2003:db8:1:0::1")) {
-               lxc_error("%s\n", "lxc.net.1.ipv6");
+               lxc_error("%s\n", "lxc.net.1.ipv6.gateway");
                return -1;
        }
 
@@ -992,9 +992,9 @@ int main(int argc, char *argv[])
        }
 
        if (set_get_compare_clear_save_load(
-               c, "lxc.net.0.ipv6", "2003:db8:1:0:214:1234:fe0b:3596/64",
+               c, "lxc.net.0.ipv6.address", "2003:db8:1:0:214:1234:fe0b:3596/64",
                tmpf, true)) {
-               lxc_error("%s\n", "lxc.net.0.ipv6");
+               lxc_error("%s\n", "lxc.net.0.ipv6.address");
                goto non_test_error;
        }
 

diff --git a/templates/lxc-altlinux.in b/templates/lxc-altlinux.in
index a0d1d5468f647cc1db8b7e7a231095cf92f69b0b..eb134e39f775e98948e6a116976d8dbafc88998a 100644 (file)
--- a/templates/lxc-altlinux.in
+++ b/templates/lxc-altlinux.in
@@ -303,7 +303,7 @@ EOF
 fi
 if [ ! -z ${ipv6} ]; then
     cat <<EOF >> $config_path/config
-lxc.net.0.ipv6 = $ipv6
+lxc.net.0.ipv6.address = $ipv6
 EOF
 fi
 if [ ! -z ${gw6} ]; then

diff --git a/templates/lxc-openmandriva.in b/templates/lxc-openmandriva.in
index bf536b7b3c912848791091e731d4ec1b832c7de3..daf4bc08ae8470ad3a5a2a9281d1dc555f0e9789 100644 (file)
--- a/templates/lxc-openmandriva.in
+++ b/templates/lxc-openmandriva.in
@@ -256,7 +256,7 @@ EOF
 fi
 if [ ! -z ${ipv6} ]; then
     cat <<EOF >> $config_path/config
-lxc.net.0.ipv6 = $ipv6
+lxc.net.0.ipv6.address = $ipv6
 EOF
 fi
 if [ ! -z ${gw6} ]; then