mirror of
https://git.proxmox.com/git/pve-common
synced 2025-04-29 03:05:24 +00:00
remove extra space after address && gateway options
only 1 space like all others options Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
parent
378c6656c9
commit
beedabb4ab
@ -1175,8 +1175,8 @@ sub __interface_to_string {
|
||||
my $raw = '';
|
||||
|
||||
$raw .= "iface $iface $family " . $d->{"method$suffix"} . "\n";
|
||||
$raw .= "\taddress " . $d->{"address$suffix"} . "\n" if $d->{"address$suffix"};
|
||||
$raw .= "\tgateway " . $d->{"gateway$suffix"} . "\n" if $d->{"gateway$suffix"};
|
||||
$raw .= "\taddress " . $d->{"address$suffix"} . "\n" if $d->{"address$suffix"};
|
||||
$raw .= "\tgateway " . $d->{"gateway$suffix"} . "\n" if $d->{"gateway$suffix"};
|
||||
|
||||
my $done = { type => 1, priority => 1, method => 1, active => 1, exists => 1,
|
||||
comments => 1, autostart => 1, options => 1,
|
||||
|
@ -25,8 +25,8 @@ update_iface('vmbr0',
|
||||
|
||||
expect load('base') . <<"EOF";
|
||||
iface vmbr0 inet static
|
||||
address $ip
|
||||
gateway $gw
|
||||
address $ip
|
||||
gateway $gw
|
||||
bridge-ports eth0
|
||||
bridge-stp off
|
||||
bridge-fd 0
|
||||
@ -41,8 +41,8 @@ update_iface('vmbr0',
|
||||
|
||||
expect load('with-ipv4') . <<"EOF";
|
||||
iface vmbr0 inet6 static
|
||||
address $ip6
|
||||
gateway $gw6
|
||||
address $ip6
|
||||
gateway $gw6
|
||||
|
||||
EOF
|
||||
|
||||
@ -57,8 +57,8 @@ delete_iface('vmbr0', 'inet');
|
||||
# bridge ports must now appear in the inet6 block
|
||||
expect load('base') . <<"EOF";
|
||||
iface vmbr0 inet6 static
|
||||
address $ip6
|
||||
gateway $gw6
|
||||
address $ip6
|
||||
gateway $gw6
|
||||
bridge-ports eth0
|
||||
bridge-stp off
|
||||
bridge-fd 0
|
||||
|
@ -25,8 +25,8 @@ my $remoteip2 = '192.168.0.4';
|
||||
my $vmbr0_part = <<"PART";
|
||||
auto vmbr0
|
||||
iface vmbr0 inet static
|
||||
address 10.0.0.2/24
|
||||
gateway 10.0.0.1
|
||||
address 10.0.0.2/24
|
||||
gateway 10.0.0.1
|
||||
bridge-ports eth0
|
||||
bridge-stp off
|
||||
bridge-fd 0
|
||||
@ -50,8 +50,8 @@ $config->{ifaces}->{eth1} = {
|
||||
my $eth1_part = <<"PART";
|
||||
auto eth1
|
||||
iface eth1 inet static
|
||||
address $ip
|
||||
gateway $gw
|
||||
address $ip
|
||||
gateway $gw
|
||||
PART
|
||||
chomp $eth1_part;
|
||||
|
||||
@ -430,8 +430,8 @@ iface eth0 inet manual
|
||||
|
||||
auto eth1
|
||||
iface eth1 inet6 static
|
||||
address $ip
|
||||
gateway $gw
|
||||
address $ip
|
||||
gateway $gw
|
||||
|
||||
iface eth2 inet manual
|
||||
|
||||
@ -439,8 +439,8 @@ iface eth3 inet manual
|
||||
|
||||
auto vmbr0
|
||||
iface vmbr0 inet static
|
||||
address 10.0.0.2/24
|
||||
gateway 10.0.0.1
|
||||
address 10.0.0.2/24
|
||||
gateway 10.0.0.1
|
||||
bridge-ports eth0
|
||||
bridge-stp off
|
||||
bridge-fd 0
|
||||
|
@ -39,8 +39,8 @@ iface eth3 inet manual
|
||||
|
||||
allow-ovs vmbr0
|
||||
iface vmbr0 inet static
|
||||
address $ip
|
||||
gateway $gw
|
||||
address $ip
|
||||
gateway $gw
|
||||
ovs_type OVSBridge
|
||||
|
||||
/etc/network/interfaces
|
||||
@ -66,8 +66,8 @@ iface eth3 inet manual
|
||||
|
||||
allow-ovs vmbr0
|
||||
iface vmbr0 inet static
|
||||
address $ip
|
||||
gateway $gw
|
||||
address $ip
|
||||
gateway $gw
|
||||
ovs_type OVSBridge
|
||||
ovs_ports eth1 eth2
|
||||
|
||||
@ -100,8 +100,8 @@ iface eth2 inet manual
|
||||
|
||||
allow-ovs vmbr0
|
||||
iface vmbr0 inet static
|
||||
address $ip
|
||||
gateway $gw
|
||||
address $ip
|
||||
gateway $gw
|
||||
ovs_type OVSBridge
|
||||
ovs_ports eth1
|
||||
|
||||
|
@ -18,8 +18,8 @@ iface eth1 inet manual
|
||||
|
||||
auto vmbr0
|
||||
iface vmbr0 inet static
|
||||
address 10.0.0.2/24
|
||||
gateway 10.0.0.1
|
||||
address 10.0.0.2/24
|
||||
gateway 10.0.0.1
|
||||
bridge-ports eth0
|
||||
bridge-stp off
|
||||
bridge-fd 0
|
||||
|
@ -25,7 +25,7 @@ iface bond0 inet manual
|
||||
|
||||
auto bond1
|
||||
iface bond1 inet static
|
||||
address 10.10.10.$ip/24
|
||||
address 10.10.10.$ip/24
|
||||
bond-slaves eth2 eth3
|
||||
bond-miimon 100
|
||||
bond-mode balance-alb
|
||||
@ -39,25 +39,25 @@ iface bond2 inet manual
|
||||
# Private networking
|
||||
|
||||
iface unknown3 inet static
|
||||
address 0.0.0.0
|
||||
address 0.0.0.0
|
||||
|
||||
iface unknown4 inet static
|
||||
address 0.0.0.0
|
||||
address 0.0.0.0
|
||||
|
||||
iface unknown5 inet static
|
||||
address 0.0.0.0
|
||||
address 0.0.0.0
|
||||
|
||||
auto vmbr0
|
||||
iface vmbr0 inet static
|
||||
address 192.168.100.13/24
|
||||
gateway 192.168.100.1
|
||||
address 192.168.100.13/24
|
||||
gateway 192.168.100.1
|
||||
bridge-ports bond0
|
||||
bridge-stp off
|
||||
bridge-fd 0
|
||||
|
||||
auto unknown6
|
||||
iface unknown6 inet static
|
||||
address 10.10.11.13/24
|
||||
address 10.10.11.13/24
|
||||
pre-up ifconfig bond0 up
|
||||
|
||||
auto vmbr3
|
||||
|
@ -29,13 +29,13 @@ iface eth0 inet manual
|
||||
|
||||
auto eth1
|
||||
iface eth1 inet static
|
||||
address $ip
|
||||
gateway $gw
|
||||
address $ip
|
||||
gateway $gw
|
||||
|
||||
auto vmbr0
|
||||
iface vmbr0 inet static
|
||||
address 10.0.0.2/24
|
||||
gateway 10.0.0.1
|
||||
address 10.0.0.2/24
|
||||
gateway 10.0.0.1
|
||||
bridge-ports eth0
|
||||
bridge-stp off
|
||||
bridge-fd 0
|
||||
@ -63,17 +63,17 @@ iface eth0 inet manual
|
||||
|
||||
auto eth1
|
||||
iface eth1 inet static
|
||||
address $ip
|
||||
gateway $gw
|
||||
address $ip
|
||||
gateway $gw
|
||||
|
||||
iface eth1 inet6 static
|
||||
address $ip6
|
||||
gateway $gw6
|
||||
address $ip6
|
||||
gateway $gw6
|
||||
|
||||
auto vmbr0
|
||||
iface vmbr0 inet static
|
||||
address 10.0.0.2/24
|
||||
gateway 10.0.0.1
|
||||
address 10.0.0.2/24
|
||||
gateway 10.0.0.1
|
||||
bridge-ports eth0
|
||||
bridge-stp off
|
||||
bridge-fd 0
|
||||
|
Loading…
Reference in New Issue
Block a user