From: Daniel Baumann Date: Tue, 31 Jul 2012 14:01:22 +0000 (+0200) Subject: Change ipv4 addresses in the configuration examples X-Git-Tag: lxc-0.8.0~54 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5548f2182e0a4c1677871aca48eaf24c19012a03;p=thirdparty%2Flxc.git Change ipv4 addresses in the configuration examples Use non-routed, private IPv4 address in documentation examples (Closes: #571525). Signed-off-by: Serge Hallyn Signed-off-by: Daniel Lezcano --- diff --git a/doc/examples/lxc-complex.conf.in b/doc/examples/lxc-complex.conf.in index 9d761cb2d..79eab75c4 100644 --- a/doc/examples/lxc-complex.conf.in +++ b/doc/examples/lxc-complex.conf.in @@ -5,19 +5,19 @@ lxc.network.type = veth lxc.network.flags = up lxc.network.link = br0 lxc.network.hwaddr = 4a:49:43:49:79:bf -lxc.network.ipv4 = 1.2.3.5/24 +lxc.network.ipv4 = 10.2.3.5/24 lxc.network.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 = 1.2.3.4/24 +lxc.network.ipv4 = 10.2.3.4/24 lxc.network.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 = 1.2.3.6/24 +lxc.network.ipv4 = 10.2.3.6/24 lxc.network.ipv6 = 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 d42d4af4a..65b57dbb6 100644 --- a/doc/examples/lxc-macvlan.conf.in +++ b/doc/examples/lxc-macvlan.conf.in @@ -4,5 +4,5 @@ lxc.network.type = macvlan lxc.network.flags = up lxc.network.link = eth0 lxc.network.hwaddr = 4a:49:43:49:79:bd -lxc.network.ipv4 = 1.2.3.4/24 +lxc.network.ipv4 = 10.2.3.4/24 lxc.network.ipv6 = 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 7c33eab6a..c8a601d5f 100644 --- a/doc/examples/lxc-phys.conf.in +++ b/doc/examples/lxc-phys.conf.in @@ -5,5 +5,5 @@ lxc.network.type = phys lxc.network.flags = up lxc.network.link = eth0 lxc.network.hwaddr = 4a:49:43:49:79:ff -lxc.network.ipv4 = 1.2.3.6/24 +lxc.network.ipv4 = 10.2.3.6/24 lxc.network.ipv6 = 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 0b1568f5e..e3b066184 100644 --- a/doc/examples/lxc-veth.conf.in +++ b/doc/examples/lxc-veth.conf.in @@ -5,5 +5,5 @@ lxc.network.type = veth lxc.network.flags = up lxc.network.link = br0 lxc.network.hwaddr = 4a:49:43:49:79:bf -lxc.network.ipv4 = 1.2.3.5/24 +lxc.network.ipv4 = 10.2.3.5/24 lxc.network.ipv6 = 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 440443933..3c6de96e7 100644 --- a/doc/examples/lxc-vlan.conf.in +++ b/doc/examples/lxc-vlan.conf.in @@ -5,5 +5,5 @@ 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 = 1.2.3.4/24 +lxc.network.ipv4 = 10.2.3.4/24 lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596 diff --git a/doc/lxc.conf.sgml.in b/doc/lxc.conf.sgml.in index 9edabf83b..05d6bc7f7 100644 --- a/doc/lxc.conf.sgml.in +++ b/doc/lxc.conf.sgml.in @@ -662,7 +662,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA lxc.network.link = br0 lxc.network.name = eth0 lxc.network.hwaddr = 4a:49:43:49:79:bf - lxc.network.ipv4 = 1.2.3.5/24 1.2.3.255 + lxc.network.ipv4 = 10.2.3.5/24 10.2.3.255 lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3597 @@ -693,21 +693,21 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA lxc.network.flags = up lxc.network.link = br0 lxc.network.hwaddr = 4a:49:43:49:79:bf - lxc.network.ipv4 = 1.2.3.5/24 1.2.3.255 + lxc.network.ipv4 = 10.2.3.5/24 10.2.3.255 lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3597 lxc.network.ipv6 = 2003:db8:1:0:214:5432:feab:3588 lxc.network.type = macvlan lxc.network.flags = up lxc.network.link = eth0 lxc.network.hwaddr = 4a:49:43:49:79:bd - lxc.network.ipv4 = 1.2.3.4/24 + lxc.network.ipv4 = 10.2.3.4/24 lxc.network.ipv4 = 192.168.10.125/24 lxc.network.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 = 1.2.3.6/24 + lxc.network.ipv4 = 10.2.3.6/24 lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3297 lxc.cgroup.cpuset.cpus = 0,1 lxc.cgroup.cpu.shares = 1234