Skip to content

Commit

Permalink
confile: lxc.net.ipv4 --> lxc.net.ipv4.address
Browse files Browse the repository at this point in the history 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
  • Loading branch information
Christian Brauner committed Jul 2, 2017
1 parent 47148e9 commit 9ff60df
Show file tree
Hide file tree
Showing 12 changed files with 33 additions and 33 deletions.
6 changes: 3 additions & 3 deletions doc/examples/lxc-complex.conf.in
View file
Expand Up @@ -5,19 +5,19 @@ 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.ipv4.address = 10.2.3.5/24
lxc.net.0.ipv6 = 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 = 10.2.3.4/24
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.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.ipv4.address = 10.2.3.6/24
lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3297
2 changes: 1 addition & 1 deletion doc/examples/lxc-macvlan.conf.in
View file
Expand Up @@ -4,5 +4,5 @@ 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.ipv4.address = 10.2.3.4/24
lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596
2 changes: 1 addition & 1 deletion doc/examples/lxc-phys.conf.in
View file
Expand Up @@ -5,5 +5,5 @@ 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.ipv4.address = 10.2.3.6/24
lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3297
2 changes: 1 addition & 1 deletion doc/examples/lxc-veth.conf.in
View file
Expand Up @@ -5,5 +5,5 @@ 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.ipv4.address = 10.2.3.5/24
lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3597
2 changes: 1 addition & 1 deletion doc/examples/lxc-vlan.conf.in
View file
Expand Up @@ -5,5 +5,5 @@ 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.ipv4.address = 10.2.3.4/24
lxc.net.0.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596
2 changes: 1 addition & 1 deletion doc/lxc.container.conf
View file
Expand Up @@ -28,7 +28,7 @@ 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.net.0.ipv4 = 1.2.3.5/24
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
Expand Down
12 changes: 6 additions & 6 deletions doc/lxc.container.conf.sgml.in
View file
Expand Up @@ -523,7 +523,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

<varlistentry>
<term>
<option>lxc.net.[i].ipv4</option>
<option>lxc.net.[i].ipv4.address</option>
</term>
<listitem>
<para>
Expand Down Expand Up @@ -1924,7 +1924,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
lxc.net.0.link = br0
lxc.net.0.name = eth0
lxc.net.0.hwaddr = 4a:49:43:49:79:bf
lxc.net.0.ipv4 = 10.2.3.5/24 10.2.3.255
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
</programlisting>
</refsect2>
Expand Down Expand Up @@ -1966,21 +1966,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
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 10.2.3.255
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.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 = 10.2.3.4/24
lxc.net.1.ipv4 = 192.168.10.125/24
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.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 = 10.2.3.6/24
lxc.net.2.ipv4.address = 10.2.3.6/24
lxc.net.2.ipv6 = 2003:db8:1:0:214:1234:fe0b:3297
lxc.cgroup.cpuset.cpus = 0,1
lxc.cgroup.cpu.shares = 1234
Expand Down
20 changes: 10 additions & 10 deletions src/lxc/confile.c
View file
Expand Up @@ -103,7 +103,7 @@ lxc_config_define(net_macvlan_mode);
lxc_config_define(net_hwaddr);
lxc_config_define(net_vlan_id);
lxc_config_define(net_mtu);
lxc_config_define(net_ipv4);
lxc_config_define(net_ipv4_address);
lxc_config_define(net_ipv4_gateway);
lxc_config_define(net_script_up);
lxc_config_define(net_script_down);
Expand Down Expand Up @@ -229,7 +229,7 @@ static struct lxc_config_t config[] = {
{ "lxc.net.mtu", set_config_net_mtu, get_config_net_mtu, clr_config_net_mtu, },
{ "lxc.net.vlan.id", set_config_net_vlan_id, get_config_net_vlan_id, clr_config_net_vlan_id, },
{ "lxc.net.ipv4.gateway", set_config_net_ipv4_gateway, get_config_net_ipv4_gateway, clr_config_net_ipv4_gateway, },
{ "lxc.net.ipv4", set_config_net_ipv4, get_config_net_ipv4, clr_config_net_ipv4, },
{ "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.", set_config_net_nic, get_config_net_nic, clr_config_net_nic, },
Expand Down Expand Up @@ -521,7 +521,7 @@ extern int lxc_list_nicconfigs(struct lxc_conf *c, const char *key, char *retv,
strprint(retv, inlen, "mtu\n");
strprint(retv, inlen, "ipv6\n");
strprint(retv, inlen, "ipv6.gateway\n");
strprint(retv, inlen, "ipv4\n");
strprint(retv, inlen, "ipv4.address\n");
strprint(retv, inlen, "ipv4.gateway\n");
}

Expand Down Expand Up @@ -756,8 +756,8 @@ static int set_config_net_mtu(const char *key, const char *value,
return set_config_string_item(&netdev->mtu, value);
}

static int set_config_net_ipv4(const char *key, const char *value,
struct lxc_conf *lxc_conf, void *data)
static int set_config_net_ipv4_address(const char *key, const char *value,
struct lxc_conf *lxc_conf, void *data)
{
struct lxc_netdev *netdev;
struct lxc_inetdev *inetdev;
Expand All @@ -766,7 +766,7 @@ static int set_config_net_ipv4(const char *key, const char *value,
char *addr = NULL, *bcast = NULL, *prefix = NULL;

if (lxc_config_value_empty(value))
return clr_config_net_ipv4(key, lxc_conf, data);
return clr_config_net_ipv4_address(key, lxc_conf, data);

if (!data)
return -1;
Expand Down Expand Up @@ -4019,8 +4019,8 @@ static int clr_config_net_ipv4_gateway(const char *key,
return 0;
}

static int clr_config_net_ipv4(const char *key, struct lxc_conf *lxc_conf,
void *data)
static int clr_config_net_ipv4_address(const char *key,
struct lxc_conf *lxc_conf, void *data)
{
struct lxc_netdev *netdev;
struct lxc_list *cur, *next;
Expand Down Expand Up @@ -4418,8 +4418,8 @@ static int get_config_net_ipv4_gateway(const char *key, char *retv, int inlen,
return fulllen;
}

static int get_config_net_ipv4(const char *key, char *retv, int inlen,
struct lxc_conf *c, void *data)
static int get_config_net_ipv4_address(const char *key, char *retv, int inlen,
struct lxc_conf *c, void *data)
{
int len, fulllen = 0;
size_t listlen;
Expand Down
12 changes: 6 additions & 6 deletions src/tests/parse_config_file.c
View file
Expand Up @@ -95,13 +95,13 @@ static int set_and_clear_complete_netdev(struct lxc_container *c)
return -1;
}

if (!c->set_config_item(c, "lxc.net.1.ipv4", "10.0.2.3/24")) {
lxc_error("%s\n", "lxc.net.1.ipv4");
if (!c->set_config_item(c, "lxc.net.1.ipv4.address", "10.0.2.3/24")) {
lxc_error("%s\n", "lxc.net.1.ipv4.address");
return -1;
}

if (!c->set_config_item(c, "lxc.net.1.ipv4_gateway", "10.0.2.2")) {
lxc_error("%s\n", "lxc.net.1.ipv4");
if (!c->set_config_item(c, "lxc.net.1.ipv4.gateway", "10.0.2.2")) {
lxc_error("%s\n", "lxc.net.1.ipv4.gateway");
return -1;
}

Expand Down Expand Up @@ -985,9 +985,9 @@ int main(int argc, char *argv[])
goto non_test_error;
}

if (set_get_compare_clear_save_load(c, "lxc.net.0.ipv4",
if (set_get_compare_clear_save_load(c, "lxc.net.0.ipv4.address",
"10.0.2.3/24", tmpf, true)) {
lxc_error("%s\n", "lxc.net.0.ipv4");
lxc_error("%s\n", "lxc.net.0.ipv4.address");
goto non_test_error;
}

Expand Down
2 changes: 1 addition & 1 deletion templates/lxc-altlinux.in
View file
Expand Up @@ -293,7 +293,7 @@ lxc.cap.drop = sys_module mac_admin mac_override sys_time
EOF
if [ ! -z ${ipv4} ]; then
cat <<EOF >> $config_path/config
lxc.net.0.ipv4 = $ipv4
lxc.net.0.ipv4.address = $ipv4
EOF
fi
if [ ! -z ${gw} ]; then
Expand Down
2 changes: 1 addition & 1 deletion templates/lxc-openmandriva.in
View file
Expand Up @@ -246,7 +246,7 @@ lxc.net.0.mtu = 1500
EOF
if [ ! -z ${ipv4} ]; then
cat <<EOF >> $config_path/config
lxc.net.0.ipv4 = $ipv4
lxc.net.0.ipv4.address = $ipv4
EOF
fi
if [ ! -z ${gw} ]; then
Expand Down
2 changes: 1 addition & 1 deletion templates/lxc-sshd.in
View file
Expand Up @@ -162,7 +162,7 @@ EOF
fi

# if no .ipv4 section in config, then have the container run dhcp
grep -q "^lxc.net.0.ipv4" $path/config || touch $rootfs/run-dhcp
grep -q "^lxc.net.0.ipv4.address" $path/config || touch $rootfs/run-dhcp

if [ "$(uname -m)" = "x86_64" ]; then
cat <<EOF >> $path/config
Expand Down

0 comments on commit 9ff60df

Please sign in to comment.