replace all lxc.network* with lxc.net*

README.md

@@ -83,8 +83,8 @@ LXC is configured via a simple set of keys. For example,
 - `lxc.mount.entry`
 
 LXC namespaces configuration keys by using single dots. This means complex
-configuration keys such as `lxc.network` expose various subkeys such as
-`lxc.network.type`, `lxc.network.link`, `lxc.network.ipv6`, and others for even
+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 is used as the default runtime for [LXD](https://github.com/lxc/lxd),

config/etc/default.conf.libvirt

-lxc.network.type = veth
-lxc.network.link = virbr0
-lxc.network.flags = up
+lxc.net.0.type = veth
+lxc.net.0.link = virbr0
+lxc.net.0.flags = up

config/etc/default.conf.unknown

-lxc.network.type = empty
+lxc.net.0.type = empty

config/init/common/lxc-containers.in

@@ -56,7 +56,7 @@ wait_for_bridge()
     local BRNAME try flags br
     [ -f "$sysconfdir"/lxc/default.conf ] || { return 0; }
 
-    BRNAME=`grep '^[ 	]*lxc.network.link' "$sysconfdir"/lxc/default.conf | sed 's/^.*=[ 	]*//'`
+    BRNAME=`grep '^[ 	]*lxc.net.0.link' "$sysconfdir"/lxc/default.conf | sed 's/^.*=[ 	]*//'`
     if [ -z "$BRNAME" ]; then
         return 0
     fi

doc/examples/lxc-complex.conf.in

 # Container with network a complex network mixing macvlan, veth and
 # physical network devices
 lxc.utsname = complex
-lxc.network.type = veth
-lxc.network.flags = up
-lxc.network.link = br0
-lxc.network.hwaddr = 4a:49:43:49:79:bf
-lxc.network.ipv4 = 10.2.3.5/24
-lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3597
+lxc.net.0.type = veth
+lxc.net.0.flags = up
+lxc.net.0.link = br0
+lxc.net.0.hwaddr = 4a:49:43:49:79:bf
+lxc.net.0.ipv4 = 10.2.3.5/24
+lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3597
 
-lxc.network.type = macvlan
-lxc.network.flags = up
-lxc.network.link = eth0
-lxc.network.hwaddr = 4a:49:43:49:79:bd
-lxc.network.ipv4 = 10.2.3.4/24
-lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596
+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 = 10.2.3.4/24
+lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596
 
-lxc.network.type = phys
-lxc.network.flags = up
-lxc.network.link = dummy0
-lxc.network.hwaddr = 4a:49:43:49:79:ff
-lxc.network.ipv4 = 10.2.3.6/24
-lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3297
+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 = 10.2.3.6/24
+lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3297

doc/examples/lxc-empty-netns.conf.in

 # Container with new network withtout network devices
 lxc.utsname = omega
-lxc.network.type = empty
-lxc.network.flags = up
+lxc.net.0.type = empty
+lxc.net.0.flags = up

doc/examples/lxc-macvlan.conf.in

 # Container with network virtualized using the macvlan device driver
 lxc.utsname = alpha
-lxc.network.type = macvlan
-lxc.network.flags = up
-lxc.network.link = eth0
-lxc.network.hwaddr = 4a:49:43:49:79:bd
-lxc.network.ipv4 = 10.2.3.4/24
-lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596
+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 = 10.2.3.4/24
+lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596

doc/examples/lxc-no-netns.conf.in

 # Container with non-virtualized network
-lxc.network.type = none
+lxc.net.0.type = none
 lxc.utsname = delta

doc/examples/lxc-phys.conf.in

 # Container with network virtualized using a physical network device with name
 # 'eth0'
 lxc.utsname = gamma
-lxc.network.type = phys
-lxc.network.flags = up
-lxc.network.link = eth0
-lxc.network.hwaddr = 4a:49:43:49:79:ff
-lxc.network.ipv4 = 10.2.3.6/24
-lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3297
+lxc.net.0.type = phys
+lxc.net.0.flags = up
+lxc.net.0.link = eth0
+lxc.net.0.hwaddr = 4a:49:43:49:79:ff
+lxc.net.0.ipv4 = 10.2.3.6/24
+lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3297

doc/examples/lxc-veth.conf.in

 # Container with network virtualized using a pre-configured bridge named br0 and
 # veth pair virtual network devices
 lxc.utsname = beta
-lxc.network.type = veth
-lxc.network.flags = up
-lxc.network.link = br0
-lxc.network.hwaddr = 4a:49:43:49:79:bf
-lxc.network.ipv4 = 10.2.3.5/24
-lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3597
+lxc.net.0.type = veth
+lxc.net.0.flags = up
+lxc.net.0.link = br0
+lxc.net.0.hwaddr = 4a:49:43:49:79:bf
+lxc.net.0.ipv4 = 10.2.3.5/24
+lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3597

doc/examples/lxc-vlan.conf.in

 # Container with network virtualized using the vlan device driver
 lxc.utsname = alpha
-lxc.network.type = vlan
-lxc.network.vlan.id = 1234
-lxc.network.flags = up
-lxc.network.link = eth0
-lxc.network.hwaddr = 4a:49:43:49:79:bd
-lxc.network.ipv4 = 10.2.3.4/24
-lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596
+lxc.net.0.type = vlan
+lxc.net.0.vlan.id = 1234
+lxc.net.0.flags = up
+lxc.net.0.link = eth0
+lxc.net.0.hwaddr = 4a:49:43:49:79:bd
+lxc.net.0.ipv4 = 10.2.3.4/24
+lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596

doc/ja/lxc-info.sgml.in

@@ -220,7 +220,7 @@ by KATOH Yasufumi <karma at jazz.email.ne.jp>
       </varlistentry>
 
       <varlistentry>
-        <term>lxc-info -n foo -c lxc.network.0.veth.pair</term>
+        <term>lxc-info -n foo -c lxc.net.0.veth.pair</term>
         <listitem>
           <para>
             <!--

doc/ko/lxc-info.sgml.in

@@ -220,7 +220,7 @@ by Sungbae Yoo <sungbae.yoo at samsung.com>
       </varlistentry>
 
       <varlistentry>
-        <term>lxc-info -n foo -c lxc.network.0.veth.pair</term>
+        <term>lxc-info -n foo -c lxc.net.0.veth.pair</term>
         <listitem>
           <para>
             <!--

doc/lxc-info.sgml.in

@@ -175,7 +175,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
       </varlistentry>
 
       <varlistentry>
-        <term>lxc-info -n foo -c lxc.network.0.veth.pair</term>
+        <term>lxc-info -n foo -c lxc.net.0.veth.pair</term>
         <listitem>
           <para>
             prints the veth pair name of foo.

doc/lxc.container.conf

@@ -12,25 +12,25 @@ lxc.utsname = virtnode
 #              should be an existing interface, usually it is eth0
 #  * phys    : the network will use a physical network device, the specified
 #              link should be an existing interface
-lxc.network.type = macvlan
+lxc.net.0.type = macvlan
 
 # specify the flags to be used for the network, actually only <up> is allowed
 # which mean the network should be set up when created. If the network is set
 # up, the loopback is automatically set up too.
-lxc.network.flags = up
+lxc.net.0.flags = up
 
 # specify the physical network device which will communicate with the
 # outside world
-lxc.network.link = eth0
+lxc.net.0.link = eth0
 
 # NIC ethernet mac address
-lxc.network.hwaddr = 4a:49:43:49:79:bd
+lxc.net.0.hwaddr = 4a:49:43:49:79:bd
 
 # specify the ipv4 address of the container. Several lines are allowed and
 # will mean several addresses will be assigned to the interface
-lxc.network.ipv4 = 1.2.3.5/24
+lxc.net.0.ipv4 = 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.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596
+lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596
 

src/lua-lxc/test/apitest.lua

@@ -225,7 +225,7 @@ end
 
 function test_container_cmd()
     log(0, "Test get config from running container...")
-    veth_pair = lxc.cmd_get_config_item(optarg["n"], "lxc.network.0.veth.pair")
+    veth_pair = lxc.cmd_get_config_item(optarg["n"], "lxc.net.0.veth.pair")
     log(0, "  veth.pair:%s", veth_pair)
 end
 
@@ -281,7 +281,7 @@ function test_config_network(net_nr)
     log(0, "Test network %d config...", net_nr)
     local netcfg
 
-    netcfg = container:get_keys("lxc.network." .. net_nr)
+    netcfg = container:get_keys("lxc.net." .. net_nr)
     if (netcfg == nil) then
 	return
     end
@@ -289,7 +289,7 @@ function test_config_network(net_nr)
 	log(0, "  %s = %s", k, v or "")
     end
     assert(netcfg["flags"] == "up")
-    assert(container:get_config_item("lxc.network."..net_nr..".type") == "veth")
+    assert(container:get_config_item("lxc.net."..net_nr..".type") == "veth")
 end
 
 

src/lxc/commands.c

@@ -523,7 +523,7 @@ static int lxc_cmd_get_cgroup_callback(int fd, struct lxc_cmd_req *req,
  * lxc_cmd_get_config_item: Get config item the running container
  *
  * @name     : name of container to connect to
- * @item     : the configuration item to retrieve (ex: lxc.network.0.veth.pair)
+ * @item     : the configuration item to retrieve (ex: lxc.net.0.veth.pair)
  * @lxcpath  : the lxcpath in which the container is running
  *
  * Returns the item on success, NULL on failure. The caller must free() the

src/lxc/conf.h

@@ -114,8 +114,8 @@ union netdev_p {
 
 /*
  * Defines a structure to configure a network device
- * @link       : lxc.network.link, name of bridge or host iface to attach if any
- * @name       : lxc.network.name, name of iface on the container side
+ * @link       : lxc.net.[i].link, name of bridge or host iface to attach if any
+ * @name       : lxc.net.[i].name, name of iface on the container side
  * @flags      : flag of the network device (IFF_UP, ... )
  * @ipv4       : a list of ipv4 addresses to be set on the network device
  * @ipv6       : a list of ipv6 addresses to be set on the network device

src/lxc/confile_utils.c

@@ -533,7 +533,7 @@ int rand_complete_hwaddr(char *hwaddr)
 }
 
 /*
- * If we find a lxc.network.hwaddr in the original config file, we expand it in
+ * If we find a lxc.net.hwaddr in the original config file, we expand it in
  * the unexpanded_config, so that after a save_config we store the hwaddr for
  * re-use.
  * This is only called when reading the config file, not when executing a

src/lxc/lxccontainer.c

@@ -2069,7 +2069,7 @@ static int do_lxcapi_get_keys(struct lxc_container *c, const char *key, char *re
 	if (!key)
 		return lxc_listconfigs(retv, inlen);
 	/*
-	 * Support 'lxc.network.<idx>', i.e. 'lxc.network.0'
+	 * Support 'lxc.net.<idx>', i.e. 'lxc.net.0'
 	 * This is an intelligent result to show which keys are valid given
 	 * the type of nic it is
 	 */

src/lxc/tools/lxc_info.c

@@ -155,15 +155,15 @@ static void print_net_stats(struct lxc_container *c)
 	char buf[256];
 
 	for(netnr = 0; ;netnr++) {
-		sprintf(buf, "lxc.network.%d.type", netnr);
+		sprintf(buf, "lxc.net.%d.type", netnr);
 		type = c->get_running_config_item(c, buf);
 		if (!type)
 			break;
 
 		if (!strcmp(type, "veth")) {
-			sprintf(buf, "lxc.network.%d.veth.pair", netnr);
+			sprintf(buf, "lxc.net.%d.veth.pair", netnr);
 		} else {
-			sprintf(buf, "lxc.network.%d.link", netnr);
+			sprintf(buf, "lxc.net.%d.link", netnr);
 		}
 		free(type);
 		ifname = c->get_running_config_item(c, buf);

src/python-lxc/examples/api_test.py

@@ -90,7 +90,7 @@ assert(capdrop == container.get_config_item("lxc.cap.drop"))
 print("Testing the networking")
 
 # A few basic checks of the current state
-assert("name" in container.get_keys("lxc.network.0"))
+assert("name" in container.get_keys("lxc.net.0"))
 assert(len(container.network) == 1)
 
 ## Starting the container

src/python-lxc/lxc/__init__.py

@@ -40,7 +40,7 @@ class ContainerNetwork(object):
         self.container = container
         self.index = index
 
-        for key in self.container.get_keys("lxc.network.%s" % self.index):
+        for key in self.container.get_keys("lxc.net.%s" % self.index):
             if "." in key:
                 self.props[key.replace(".", "_")] = key
             else:
@@ -98,18 +98,18 @@ class ContainerNetwork(object):
 
     def __clear_network_item(self, key):
         if key in ("ipv4", "ipv6"):
-            return self.container.clear_config_item("lxc.network.%s.%s" % (
+            return self.container.clear_config_item("lxc.net.%s.%s" % (
                                                     self.index, key))
         else:
-            return self.container.set_config_item("lxc.network.%s.%s" % (
+            return self.container.set_config_item("lxc.net.%s.%s" % (
                                                     self.index, key), "")
 
     def __get_network_item(self, key):
-        return self.container.get_config_item("lxc.network.%s.%s" % (
+        return self.container.get_config_item("lxc.net.%s.%s" % (
                                               self.index, key))
 
     def __set_network_item(self, key, value):
-        return self.container.set_config_item("lxc.network.%s.%s" % (
+        return self.container.set_config_item("lxc.net.%s.%s" % (
                                               self.index, key), value)
 
 
@@ -124,7 +124,7 @@ class ContainerNetworkList():
         return ContainerNetwork(self.container, index)
 
     def __len__(self):
-        values = self.container.get_config_item("lxc.network")
+        values = self.container.get_config_item("lxc.net")
 
         if values:
             return len(values)
@@ -134,7 +134,7 @@ class ContainerNetworkList():
     def add(self, network_type):
         index = len(self)
 
-        return self.container.set_config_item("lxc.network.%s.type" % index,
+        return self.container.set_config_item("lxc.net.%s.type" % index,
                                               network_type)
 
     def remove(self, index):
@@ -142,7 +142,7 @@ class ContainerNetworkList():
         if index >= count:
             raise IndexError("list index out of range")
 
-        return self.container.clear_config_item("lxc.network.%s" % index)
+        return self.container.clear_config_item("lxc.net.%s" % index)
 
 
 class Container(_lxc.Container):

src/tests/aa.c

@@ -161,7 +161,7 @@ int main(int argc, char *argv[])
 		fprintf(stderr, "%d: %s thought it was defined\n", __LINE__, MYNAME);
 		goto err;
 	}
-	if (!c->set_config_item(c, "lxc.network.type", "empty")) {
+	if (!c->set_config_item(c, "lxc.net.0.type", "empty")) {
 		fprintf(stderr, "%s: %d: failed to set network type\n", __FILE__, __LINE__);
 		goto err;
 	}

src/tests/cgpath.c

@@ -143,7 +143,7 @@ static int test_container(const char *lxcpath,
 		c->destroy(c);
 		c = lxc_container_new(name, lxcpath);
 	}
-	c->set_config_item(c, "lxc.network.type", "empty");
+	c->set_config_item(c, "lxc.net.0.type", "empty");
 	if (!c->createl(c, template, NULL, NULL, 0, NULL)) {
 		TSTERR("creating container %s", name);
 		goto out2;

src/tests/createtest.c

@@ -44,12 +44,12 @@ int main(int argc, char *argv[])
 		goto out;
 	}
 
-	if (!c->set_config_item(c, "lxc.network.type", "veth")) {
+	if (!c->set_config_item(c, "lxc.net.0.type", "veth")) {
 		fprintf(stderr, "%d: failed to set network type\n", __LINE__);
 		goto out;
 	}
-	c->set_config_item(c, "lxc.network.link", "lxcbr0");
-	c->set_config_item(c, "lxc.network.flags", "up");
+	c->set_config_item(c, "lxc.net.0.link", "lxcbr0");
+	c->set_config_item(c, "lxc.net.0.flags", "up");
 	if (!c->createl(c, "busybox", NULL, NULL, 0, NULL)) {
 		fprintf(stderr, "%d: failed to create a trusty container\n", __LINE__);
 		goto out;

src/tests/get_item.c

@@ -293,7 +293,7 @@ int main(int argc, char *argv[])
 	printf("%d: get_config_item(lxc.cap.drop) returned %d %s\n", __LINE__, ret, v2);
 	ret = c->get_config_item(c, "lxc.network", v2, 255);
 	if (ret < 0) {
-		fprintf(stderr, "%d: get_config_item returned %d\n", __LINE__, ret);
+		fprintf(stderr, "%d: get_config_item(lxc.network) returned %d\n", __LINE__, ret);
 		goto out;
 	}
 	printf("%d: get_config_item(lxc.network) returned %d %s\n", __LINE__, ret, v2);

src/tests/lxc-test-apparmor-mount

@@ -100,8 +100,8 @@ usermod -v 910000-919999 -w 910000-919999 $TUSER
 
 mkdir -p $HDIR/.config/lxc/
 cat > $HDIR/.config/lxc/default.conf << EOF
-lxc.network.type = veth
-lxc.network.link = lxcbr0
+lxc.net.0.type = veth
+lxc.net.0.link = lxcbr0
 lxc.id_map = u 0 910000 9999
 lxc.id_map = g 0 910000 9999
 EOF

src/tests/lxc-test-cloneconfig

@@ -48,12 +48,12 @@ cleanup() {
 }
 
 verify_numnics() {
-	verify_unchanged_number lxc.network.type "network defs"
+	verify_unchanged_number lxc.net.0.type "network defs"
 }
 
 verify_hwaddr() {
-	verify_unchanged_number lxc.network.hwaddr "hwaddr defs"
-	grep ^lxc.network.hwaddr $CONTAINER_PATH/config | while read line; do
+	verify_unchanged_number lxc.net.0.hwaddr "hwaddr defs"
+	grep ^lxc.net.0.hwaddr $CONTAINER_PATH/config | while read line; do
 		addr=`echo $line | awk -F= { print $2 }`
 		echo "looking for $addr in $CONTAINER2_PATH/config"
 		if grep -q $addr $CONTAINER2_PATH/config; then
@@ -80,20 +80,20 @@ trap cleanup EXIT
 
 # Simple nic
 cat > $s/1.conf << EOF
-lxc.network.type = veth
-lxc.network.link = lxcbr0
+lxc.net.0.type = veth
+lxc.net.0.link = lxcbr0
 EOF
 
 # Simple nic with hwaddr; verify hwaddr changed
 cat > $s/2.conf << EOF
-lxc.network.type = veth
-lxc.network.link = lxcbr0
+lxc.net.0.type = veth
+lxc.net.0.link = lxcbr0
 EOF
 
 # No nics, but nic from include
 cat > $s/1.include << EOF
-lxc.network.type = veth
-lxc.network.link = lxcbr0
+lxc.net.0.type = veth
+lxc.net.0.link = lxcbr0
 lxc.hook.start = /bin/bash
 EOF
 cat > $s/3.conf << EOF

src/tests/lxc-test-createconfig

@@ -34,8 +34,8 @@ cleanup() {
 trap cleanup EXIT
 
 cat > $f << EOF
-lxc.network.type = veth
-lxc.network.hwaddr = 00:16:3e:xx:xx:xx
+lxc.net.0.type = veth
+lxc.net.0.hwaddr = 00:16:3e:xx:xx:xx
 EOF
 lxc-create -t busybox -f $f -n lxctestc
 grep -q "xx:xx" /var/lib/lxc/lxctestc/config && { echo "hwaddr not expanded"; exit 1; }

src/tests/lxc-test-no-new-privs

@@ -38,8 +38,8 @@ trap cleanup EXIT SIGHUP SIGINT SIGTERM
 
 mkdir -p /etc/lxc/
 cat > /etc/lxc/default.conf << EOF
-lxc.network.type = veth
-lxc.network.link = lxcbr0
+lxc.net.0.type = veth
+lxc.net.0.link = lxcbr0
 EOF
 
 ARCH=i386

src/tests/lxc-test-unpriv

@@ -116,8 +116,8 @@ usermod -v 910000-919999 -w 910000-919999 $TUSER
 
 mkdir -p $HDIR/.config/lxc/
 cat > $HDIR/.config/lxc/default.conf << EOF
-lxc.network.type = veth
-lxc.network.link = lxcbr0
+lxc.net.0.type = veth
+lxc.net.0.link = lxcbr0
 lxc.id_map = u 0 910000 9999
 lxc.id_map = g 0 910000 9999
 EOF

src/tests/lxc-test-usernic.in

@@ -80,7 +80,7 @@ usermod -v 910000-919999 -w 910000-919999 usernic-user
 
 mkdir -p /home/usernic-user/.config/lxc/
 cat > /home/usernic-user/.config/lxc/default.conf << EOF
-lxc.network.type = empty
+lxc.net.0.type = empty
 lxc.id_map = u 0 910000 10000
 lxc.id_map = g 0 910000 10000
 EOF

src/tests/shutdowntest.c

@@ -45,12 +45,12 @@ int main(int argc, char *argv[])
 		goto out;
 	}
 
-	if (!c->set_config_item(c, "lxc.network.type", "veth")) {
+	if (!c->set_config_item(c, "lxc.net.0.type", "veth")) {
 		fprintf(stderr, "%d: failed to set network type\n", __LINE__);
 		goto out;
 	}
-	c->set_config_item(c, "lxc.network.link", "lxcbr0");
-	c->set_config_item(c, "lxc.network.flags", "up");
+	c->set_config_item(c, "lxc.net.0.link", "lxcbr0");
+	c->set_config_item(c, "lxc.net.0.flags", "up");
 	if (!c->createl(c, "busybox", NULL, NULL, 0, NULL)) {
 		fprintf(stderr, "%d: failed to create a container\n", __LINE__);
 		goto out;

src/tests/snapshot.c

@@ -72,7 +72,7 @@ int main(int argc, char *argv[])
 		fprintf(stderr, "%d: %s thought it was defined\n", __LINE__, MYNAME);
 		(void) c->destroy_with_snapshots(c);
 	}
-	if (!c->set_config_item(c, "lxc.network.type", "empty")) {
+	if (!c->set_config_item(c, "lxc.net.0.type", "empty")) {
 		fprintf(stderr, "%s: %d: failed to set network type\n", __FILE__, __LINE__);
 		goto err;
 	}

templates/lxc-altlinux.in

@@ -276,30 +276,30 @@ lxc.cap.drop = sys_module mac_admin mac_override sys_time
 #lxc.aa_profile = unconfined
 
 #networking
-#lxc.network.type = $lxc_network_type
-#lxc.network.flags = up
-#lxc.network.link = $lxc_network_link
-#lxc.network.name = veth0
-#lxc.network.mtu = 1500
+#lxc.net.0.type = $lxc_network_type
+#lxc.net.0.flags = up
+#lxc.net.0.link = $lxc_network_link
+#lxc.net.0.name = veth0
+#lxc.net.0.mtu = 1500
 EOF
 if [ ! -z ${ipv4} ]; then
     cat <<EOF >> $config_path/config
-lxc.network.ipv4 = $ipv4
+lxc.net.0.ipv4 = $ipv4
 EOF
 fi
 if [ ! -z ${gw} ]; then
     cat <<EOF >> $config_path/config
-lxc.network.ipv4.gateway = $gw
+lxc.net.0.ipv4.gateway = $gw
 EOF
 fi
 if [ ! -z ${ipv6} ]; then
     cat <<EOF >> $config_path/config
-lxc.network.ipv6 = $ipv6
+lxc.net.0.ipv6 = $ipv6
 EOF
 fi
 if [ ! -z ${gw6} ]; then
     cat <<EOF >> $config_path/config
-lxc.network.ipv6.gateway = $gw6
+lxc.net.0.ipv6.gateway = $gw6
 EOF
 fi
     cat <<EOF >> $config_path/config

templates/lxc-centos.in

@@ -618,13 +618,13 @@ lxc.rootfs = $rootfs_path
         # Seems that \s doesn't work in brackets.
         KEY=$(expr "${LINE}" : '\s*\([^	 ]*\)\s*=')
 
-        if [[ "${KEY}" != "lxc.network.hwaddr" ]]
+        if [[ "${KEY}" != "lxc.net.0.hwaddr" ]]
         then
             echo ${LINE} >> $config_path/config
 
-            if [[ "${KEY}" == "lxc.network.link" ]]
+            if [[ "${KEY}" == "lxc.net.0.link" ]]
             then
-                echo "lxc.network.hwaddr = $(create_hwaddr)" >> $config_path/config
+                echo "lxc.net.0.hwaddr = $(create_hwaddr)" >> $config_path/config
             fi
         fi
     done < $config_path/config.def
@@ -647,16 +647,16 @@ lxc.utsname = $utsname
 #lxc.aa_profile = unconfined
 
 # example simple networking setup, uncomment to enable
-#lxc.network.type = $lxc_network_type
-#lxc.network.flags = up
-#lxc.network.link = $lxc_network_link
-#lxc.network.name = eth0
+#lxc.net.0.type = $lxc_network_type
+#lxc.net.0.flags = up
+#lxc.net.0.link = $lxc_network_link
+#lxc.net.0.name = eth0
 # Additional example for veth network type
 #    static MAC address,
-#lxc.network.hwaddr = 00:16:3e:77:52:20
+#lxc.net.0.hwaddr = 00:16:3e:77:52:20
 #    persistent veth device name on host side
 #        Note: This may potentially collide with other containers of same name!
-#lxc.network.veth.pair = v-$name-e0
+#lxc.net.0.veth.pair = v-$name-e0
 
 EOF
 

templates/lxc-debian.in

@@ -493,9 +493,9 @@ copy_configuration()
     # Generate the configuration file
     # if there is exactly one veth network entry, make sure it has an
     # associated hwaddr.
-    nics=$(grep -ce '^lxc\.network\.type[ \t]*=[ \t]*veth' "$path/config")
+    nics=$(grep -ce '^lxc\.net\.0\.type[ \t]*=[ \t]*veth' "$path/config")
     if [ "$nics" -eq 1 ]; then
-        grep -q "^lxc.network.hwaddr" "$path/config" || sed -i -e "/^lxc\.network\.type[ \t]*=[ \t]*veth/a lxc.network.hwaddr = 00:16:3e:$(openssl rand -hex 3| sed 's/\(..\)/\1:/g; s/.$//')" "$path/config"
+        grep -q "^lxc.net.0.hwaddr" "$path/config" || sed -i -e "/^lxc\.net\.0\.type[ \t]*=[ \t]*veth/a lxc.net.0.hwaddr = 00:16:3e:$(openssl rand -hex 3| sed 's/\(..\)/\1:/g; s/.$//')" "$path/config"
     fi
 
     ## Add all the includes

templates/lxc-download.in

@@ -526,7 +526,7 @@ if [ ! -e $configfile ]; then
 fi
 
 ## Extract all the network config entries
-sed -i -e "/lxc.network/{w ${LXC_PATH}/config-network" -e "d}" \
+sed -i -e "/lxc.net.0/{w ${LXC_PATH}/config-network" -e "d}" \
     ${LXC_PATH}/config
 
 ## Extract any other config entry

templates/lxc-fedora-legacy.in

@@ -1104,13 +1104,13 @@ lxc.rootfs = $rootfs_path
         # Seems that \s doesn't work in brackets.
         KEY=$(expr "${LINE}" : '\s*\([^	 ]*\)\s*=')
 
-        if [[ "${KEY}" != "lxc.network.hwaddr" ]]
+        if [[ "${KEY}" != "lxc.net.0.hwaddr" ]]
         then
             echo "${LINE}" >> $config_path/config
 
-            if [[ "${KEY}" == "lxc.network.link" ]]
+            if [[ "${KEY}" == "lxc.net.0.link" ]]
             then
-                echo "lxc.network.hwaddr = $(create_hwaddr)" >> $config_path/config
+                echo "lxc.net.0.hwaddr = $(create_hwaddr)" >> $config_path/config
             fi
         fi
     done < $config_path/config.def
@@ -1133,16 +1133,16 @@ lxc.utsname = $utsname
 #lxc.aa_profile = unconfined
 
 # example simple networking setup, uncomment to enable
-#lxc.network.type = $lxc_network_type
-#lxc.network.flags = up
-#lxc.network.link = $lxc_network_link
-#lxc.network.name = eth0
+#lxc.net.0.type = $lxc_network_type
+#lxc.net.0.flags = up
+#lxc.net.0.link = $lxc_network_link
+#lxc.net.0.name = eth0
 # Additional example for veth network type
 #    static MAC address,
-#lxc.network.hwaddr = 00:16:3e:77:52:20
+#lxc.net.0.hwaddr = 00:16:3e:77:52:20
 #    persistent veth device name on host side
 #        Note: This may potentially collide with other containers of same name!
-#lxc.network.veth.pair = v-$name-e0
+#lxc.net.0.veth.pair = v-$name-e0
 
 EOF
 

templates/lxc-fedora.in

@@ -463,13 +463,13 @@ lxc.rootfs = ${rootfs}
         # Seems that \s doesn't work in brackets.
         key=$(expr "${line}" : '\s*\([^	 ]*\)\s*=')
 
-        if [ "${key}" != "lxc.network.hwaddr" ]
+        if [ "${key}" != "lxc.net.0.hwaddr" ]
         then
             echo "${line}" >> "${config}"
 
-            if [ "${key}" == "lxc.network.link" ]
+            if [ "${key}" == "lxc.net.0.link" ]
             then
-                echo "lxc.network.hwaddr = $(create_hwaddr)" >> "${config}"
+                echo "lxc.net.0.hwaddr = $(create_hwaddr)" >> "${config}"
             fi
         fi
     done < "${config}.orig"
@@ -492,16 +492,16 @@ lxc.utsname = ${utsname}
 #lxc.aa_profile = unconfined
 
 # example simple networking setup, uncomment to enable
-#lxc.network.type = ${lxc_network_type}
-#lxc.network.flags = up
-#lxc.network.link = ${lxc_network_link}
-#lxc.network.name = eth0
+#lxc.net.0.type = ${lxc_network_type}
+#lxc.net.0.flags = up
+#lxc.net.0.link = ${lxc_network_link}
+#lxc.net.0.name = eth0
 # Additional example for veth network type
 #    static MAC address,
-#lxc.network.hwaddr = $(create_hwaddr)
+#lxc.net.0.hwaddr = $(create_hwaddr)
 #    persistent veth device name on host side
 #        Note: This may potentially collide with other containers of same name!
-#lxc.network.veth.pair = v-${name}-e0
+#lxc.net.0.veth.pair = v-${name}-e0
 EOF
 
     if [ $? -ne 0 ]

templates/lxc-gentoo.in

@@ -517,7 +517,7 @@ container_conf_net()
         value=$(echo "${line}" | sed 's/^.*_real_ugly_sep_42_//')
 
         #new nic !
-        if [[ "${key}" == "lxc.network.type" ]]; then
+        if [[ "${key}" == "lxc.net.0.type" ]]; then
             #we don't know what to do with it.
             [[ "${value}" == "empty" ]] && continue
 
@@ -535,15 +535,15 @@ container_conf_net()
             nic_type="${value}"
         fi
 
-                if [[ "${key}" == "lxc.network.hwaddr" ]]; then
+                if [[ "${key}" == "lxc.net.0.hwaddr" ]]; then
                 nic_hwaddr=1
         fi
 
-        if [[ "${key}" =~ ^lxc.network.ipv(4|6) ]]; then
+        if [[ "${key}" =~ ^lxc.net.0.ipv(4|6) ]]; then
             #tell openrc to not manage this NIC as LXC set there address
             nic_conf="null"
         fi
-        if [[ "${key}" =~ ^lxc.network.name ]]; then
+        if [[ "${key}" =~ ^lxc.net.0.name ]]; then
             nic_name="${value}"
             let nic_named=nic_named+1
         fi
@@ -583,10 +583,10 @@ container_net()
                         store_user_message "No network interface for this container
 It's a pitty, you have bridge, ${bridge}.
 If it is for Lxc, use it next time by adding this to your default.conf :
-lxc.network.type = veth
-lxc.network.link = ${bridge}
-lxc.network.flags = up
-lxc.network.hwaddr = fe:xx:xx:xx:xx:xx"
+lxc.net.0.type = veth
+lxc.net.0.link = ${bridge}
+lxc.net.0.flags = up
+lxc.net.0.hwaddr = fe:xx:xx:xx:xx:xx"
                         return 0
         else
                 store_user_message "No network interface for this container"
@@ -681,9 +681,9 @@ container_conf()
 
     # if there is exactly one veth network entry, make sure it has an
     # associated hwaddr.
-    nics=`grep -e '^lxc\.network\.type[ \t]*=[ \t]*veth' ${conf_file} | wc -l`
+    nics=`grep -e '^lxc\.net\.0\.type[ \t]*=[ \t]*veth' ${conf_file} | wc -l`
     if [ $nics -eq 1 ]; then
-        grep -q "^lxc.network.hwaddr" ${conf_file} || sed -i -e "/^lxc\.network\.type[ \t]*=[ \t]*veth/a lxc.network.hwaddr = 00:16:3e:$(openssl rand -hex 3| sed 's/\(..\)/\1:/g; s/.$//')" ${conf_file}
+        grep -q "^lxc.net.0.hwaddr" ${conf_file} || sed -i -e "/^lxc\.net\.0\.type[ \t]*=[ \t]*veth/a lxc.net.0.hwaddr = 00:16:3e:$(openssl rand -hex 3| sed 's/\(..\)/\1:/g; s/.$//')" ${conf_file}
     fi
 
     if grep -q "^lxc.rootfs" "${conf_file}" ; then

templates/lxc-openmandriva.in

@@ -238,30 +238,30 @@ lxc.mount.auto = cgroup:mixed proc:mixed sys:mixed
 #lxc.aa_profile = unconfined
 
 #networking
-lxc.network.type = $lxc_network_type
-lxc.network.flags = up
-lxc.network.link = $lxc_network_link
-lxc.network.name = eth0
-lxc.network.mtu = 1500
+lxc.net.0.type = $lxc_network_type
+lxc.net.0.flags = up
+lxc.net.0.link = $lxc_network_link
+lxc.net.0.name = eth0
+lxc.net.0.mtu = 1500
 EOF
 if [ ! -z ${ipv4} ]; then
     cat <<EOF >> $config_path/config
-lxc.network.ipv4 = $ipv4
+lxc.net.0.ipv4 = $ipv4
 EOF
 fi
 if [ ! -z ${gw} ]; then
     cat <<EOF >> $config_path/config
-lxc.network.ipv4.gateway = $gw
+lxc.net.0.ipv4.gateway = $gw
 EOF
 fi
 if [ ! -z ${ipv6} ]; then
     cat <<EOF >> $config_path/config
-lxc.network.ipv6 = $ipv6
+lxc.net.0.ipv6 = $ipv6
 EOF
 fi
 if [ ! -z ${gw6} ]; then
     cat <<EOF >> $config_path/config
-lxc.network.ipv6.gateway = $gw6
+lxc.net.0.ipv6.gateway = $gw6
 EOF
 fi
     cat <<EOF >> $config_path/config

templates/lxc-opensuse.in

@@ -327,13 +327,13 @@ lxc.rootfs = $rootfs_path
         # Seems that \s doesn't work in brackets.
         KEY=$(expr "${LINE}" : '\s*\([^	 ]*\)\s*=')
 
-        if [[ "${KEY}" != "lxc.network.hwaddr" ]]
+        if [[ "${KEY}" != "lxc.net.0.hwaddr" ]]
         then
             echo "${LINE}" >> $path/config
 
-            if [[ "${KEY}" == "lxc.network.link" ]]
+            if [[ "${KEY}" == "lxc.net.0.link" ]]
             then
-                echo "lxc.network.hwaddr = $(create_hwaddr)" >> $path/config
+                echo "lxc.net.0.hwaddr = $(create_hwaddr)" >> $path/config
             fi
         fi
     done < $path/config.def
@@ -358,16 +358,16 @@ lxc.mount.auto = cgroup:mixed proc:mixed sys:mixed
 lxc.aa_profile = unconfined
 
 # example simple networking setup, uncomment to enable
-#lxc.network.type = $lxc_network_type
-#lxc.network.flags = up
-#lxc.network.link = $lxc_network_link
-#lxc.network.name = eth0
+#lxc.net.0.type = $lxc_network_type
+#lxc.net.0.flags = up
+#lxc.net.0.link = $lxc_network_link
+#lxc.net.0.name = eth0
 # Additional example for veth network type
 #    static MAC address,
-#lxc.network.hwaddr = 00:16:3e:77:52:20
+#lxc.net.0.hwaddr = 00:16:3e:77:52:20
 #    persistent veth device name on host side
 #        Note: This may potentially collide with other containers of same name!
-#lxc.network.veth.pair = v-$name-e0
+#lxc.net.0.veth.pair = v-$name-e0
 
 EOF
 

templates/lxc-oracle.in

@@ -497,36 +497,36 @@ EOF
 
     echo "# Networking" >>$cfg_dir/config
     # see if the default network settings were already specified
-    lxc_network_type=`grep '^lxc.network.type' $cfg_dir/config | awk -F'[= \t]+' '{ print $2 }'`
+    lxc_network_type=`grep '^lxc.net.0.type' $cfg_dir/config | awk -F'[= \t]+' '{ print $2 }'`
     if [ -z "$lxc_network_type" ]; then
-        echo "lxc.network.type = veth" >>$cfg_dir/config
+        echo "lxc.net.0.type = veth" >>$cfg_dir/config
         lxc_network_type=veth
     fi
 
-    lxc_network_link=`grep '^lxc.network.link' $cfg_dir/config | awk -F'[= \t]+' '{ print $2 }'`
+    lxc_network_link=`grep '^lxc.net.0.link' $cfg_dir/config | awk -F'[= \t]+' '{ print $2 }'`
     if [ -z "$lxc_network_link" ]; then
-        echo "lxc.network.link = lxcbr0" >>$cfg_dir/config
+        echo "lxc.net.0.link = lxcbr0" >>$cfg_dir/config
         lxc_network_link=lxcbr0
     fi
 
-    lxc_network_hwaddr=`grep '^lxc.network.hwaddr' $cfg_dir/config | awk -F'[= \t]+' '{ print $2 }'`
+    lxc_network_hwaddr=`grep '^lxc.net.0.hwaddr' $cfg_dir/config | awk -F'[= \t]+' '{ print $2 }'`
     if [ -z "$lxc_network_hwaddr" ]; then
 	# generate a hwaddr for the container
         # see http://sourceforge.net/tracker/?func=detail&aid=3411497&group_id=163076&atid=826303
         local hwaddr="00:16:3e:`dd if=/dev/urandom bs=8 count=1 2>/dev/null |od -t x8 | \
                         head -n1 | awk '{print $2}' | cut -c1-6 | \
                         sed 's/\(..\)/\1:/g; s/.$//'`"
-        echo "lxc.network.hwaddr = $hwaddr" >>$cfg_dir/config
+        echo "lxc.net.0.hwaddr = $hwaddr" >>$cfg_dir/config
     fi
 
-    lxc_network_flags=`grep '^lxc.network.flags' $cfg_dir/config | awk -F'[= \t]+' '{ print $2 }'`
+    lxc_network_flags=`grep '^lxc.net.0.flags' $cfg_dir/config | awk -F'[= \t]+' '{ print $2 }'`
     if [ -z "$lxc_network_flags" ]; then
-        echo "lxc.network.flags = up" >>$cfg_dir/config
+        echo "lxc.net.0.flags = up" >>$cfg_dir/config
     fi
 
     cat <<EOF >> $cfg_dir/config || die "unable to create $cfg_dir/config"
-lxc.network.name = eth0
-lxc.network.mtu = 1500
+lxc.net.0.name = eth0
+lxc.net.0.mtu = 1500
 EOF
 }
 

templates/lxc-sparclinux.in

@@ -326,36 +326,36 @@ EOF
 
     echo "# Networking" >>$cfg_dir/config
     # see if the default network settings were already specified
-    lxc_network_type=`grep '^lxc.network.type' $cfg_dir/config | awk -F'[= \t]+' '{ print $2 }'`
+    lxc_network_type=`grep '^lxc.net.0.type' $cfg_dir/config | awk -F'[= \t]+' '{ print $2 }'`
     if [ -z "$lxc_network_type" ]; then
-        echo "lxc.network.type = veth" >>$cfg_dir/config
+        echo "lxc.net.0.type = veth" >>$cfg_dir/config
         lxc_network_type=veth
     fi
 
-    lxc_network_link=`grep '^lxc.network.link' $cfg_dir/config | awk -F'[= \t]+' '{ print $2 }'`
+    lxc_network_link=`grep '^lxc.net.0.link' $cfg_dir/config | awk -F'[= \t]+' '{ print $2 }'`
     if [ -z "$lxc_network_link" ]; then
-        echo "lxc.network.link = lxcbr0" >>$cfg_dir/config
+        echo "lxc.net.0.link = lxcbr0" >>$cfg_dir/config
         lxc_network_link=lxcbr0
     fi
 
-    lxc_network_hwaddr=`grep '^lxc.network.hwaddr' $cfg_dir/config | awk -F'[= \t]+' '{ print $2 }'`
+    lxc_network_hwaddr=`grep '^lxc.net.0.hwaddr' $cfg_dir/config | awk -F'[= \t]+' '{ print $2 }'`
     if [ -z "$lxc_network_hwaddr" ]; then
         # generate a hwaddr for the container
         # see http://sourceforge.net/tracker/?func=detail&aid=3411497&group_id=163076&atid=826303
         local hwaddr="00:16:3e:`dd if=/dev/urandom bs=8 count=1 2>/dev/null |od -t x8 | \
                         head -n1 | awk '{print $2}' | cut -c1-6 | \
                         sed 's/\(..\)/\1:/g; s/.$//'`"
-        echo "lxc.network.hwaddr = $hwaddr" >>$cfg_dir/config
+        echo "lxc.net.0.hwaddr = $hwaddr" >>$cfg_dir/config
     fi
 
-    lxc_network_flags=`grep '^lxc.network.flags' $cfg_dir/config | awk -F'[= \t]+' '{ print $2 }'`
+    lxc_network_flags=`grep '^lxc.net.0.flags' $cfg_dir/config | awk -F'[= \t]+' '{ print $2 }'`
     if [ -z "$lxc_network_flags" ]; then
-        echo "lxc.network.flags = up" >>$cfg_dir/config
+        echo "lxc.net.0.flags = up" >>$cfg_dir/config
     fi
 
     cat <<EOF >> $cfg_dir/config || die "unable to create $cfg_dir/config"
-lxc.network.name = eth0
-lxc.network.mtu = 1500
+lxc.net.0.name = eth0
+lxc.net.0.mtu = 1500
 EOF
 }
 

templates/lxc-sshd.in

@@ -162,7 +162,7 @@ EOF
     fi
 
     # if no .ipv4 section in config, then have the container run dhcp
-    grep -q "^lxc.network.ipv4" $path/config || touch $rootfs/run-dhcp
+    grep -q "^lxc.net.0.ipv4" $path/config || touch $rootfs/run-dhcp
 
     if [ "$(uname -m)" = "x86_64" ]; then
         cat <<EOF >> $path/config

templates/lxc-ubuntu-cloud.in

@@ -60,14 +60,14 @@ copy_configuration()
 
     # if there is exactly one veth network entry, make sure it has an
     # associated hwaddr.
-    nics=`grep -e '^lxc\.network\.type[ \t]*=[ \t]*veth' $path/config | wc -l`
+    nics=`grep -e '^lxc\.net\.0\.type[ \t]*=[ \t]*veth' $path/config | wc -l`
     if [ $nics -eq 1 ]; then
-        grep -q "^lxc.network.hwaddr" $path/config || sed -i -e "/^lxc\.network\.type[ \t]*=[ \t]*veth/a lxc.network.hwaddr = 00:16:3e:$(openssl rand -hex 3| sed 's/\(..\)/\1:/g; s/.$//')" $path/config
+        grep -q "^lxc.net.0.hwaddr" $path/config || sed -i -e "/^lxc\.net\.0\.type[ \t]*=[ \t]*veth/a lxc.net.0.hwaddr = 00:16:3e:$(openssl rand -hex 3| sed 's/\(..\)/\1:/g; s/.$//')" $path/config
     fi
 
     # Generate the configuration file
     ## Relocate all the network config entries
-    sed -i -e "/lxc.network/{w ${path}/config-network" -e "d}" $path/config
+    sed -i -e "/lxc.net.0/{w ${path}/config-network" -e "d}" $path/config
 
     ## Relocate any other config entries
     sed -i -e "/lxc./{w ${path}/config-auto" -e "d}" $path/config

templates/lxc-ubuntu.in

@@ -503,14 +503,14 @@ copy_configuration()
 
     # if there is exactly one veth network entry, make sure it has an
     # associated hwaddr.
-    nics=`grep -e '^lxc\.network\.type[ \t]*=[ \t]*veth' $path/config | wc -l`
+    nics=`grep -e '^lxc\.net\.0\.type[ \t]*=[ \t]*veth' $path/config | wc -l`
     if [ $nics -eq 1 ]; then
-        grep -q "^lxc.network.hwaddr" $path/config || sed -i -e "/^lxc\.network\.type[ \t]*=[ \t]*veth/a lxc.network.hwaddr = 00:16:3e:$(openssl rand -hex 3| sed 's/\(..\)/\1:/g; s/.$//')" $path/config
+        grep -q "^lxc.net.0.hwaddr" $path/config || sed -i -e "/^lxc\.net\.0\.type[ \t]*=[ \t]*veth/a lxc.net.0.hwaddr = 00:16:3e:$(openssl rand -hex 3| sed 's/\(..\)/\1:/g; s/.$//')" $path/config
     fi
 
     # Generate the configuration file
     ## Relocate all the network config entries
-    sed -i -e "/lxc.network/{w ${path}/config-network" -e "d}" $path/config
+    sed -i -e "/lxc.net.0/{w ${path}/config-network" -e "d}" $path/config
 
     ## Relocate any other config entries
     sed -i -e "/lxc./{w ${path}/config-auto" -e "d}" $path/config