Proxmox/pve-common
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-common.git synced 2025-01-03 09:17:36 +03:00
Code Releases Activity

remove extra space after address && gateway options

Browse Source 
only 1 space like all others options

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier 2020-02-20 12:55:19 +01:00 committed by Thomas Lamprecht
parent 378c6656c9
commit beedabb4ab
7 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/PVE/INotify.pm
View File

@ -1175,8 +1175,8 @@ sub __interface_to_string {
my $raw = ''; my $raw = '';
$raw .= "iface $iface $family " . $d->{"method$suffix"} . "\n"; $raw .= "iface $iface $family " . $d->{"method$suffix"} . "\n";
$raw .= "\taddress " . $d->{"address$suffix"} . "\n" if $d->{"address$suffix"}; $raw .= "\taddress " . $d->{"address$suffix"} . "\n" if $d->{"address$suffix"};
$raw .= "\tgateway " . $d->{"gateway$suffix"} . "\n" if $d->{"gateway$suffix"}; $raw .= "\tgateway " . $d->{"gateway$suffix"} . "\n" if $d->{"gateway$suffix"};
my $done = { type => 1, priority => 1, method => 1, active => 1, exists => 1, my $done = { type => 1, priority => 1, method => 1, active => 1, exists => 1,
comments => 1, autostart => 1, options => 1, comments => 1, autostart => 1, options => 1,

12
test/etc_network_interfaces/t.bridge-v4-v6.pl
View File

@ -25,8 +25,8 @@ update_iface('vmbr0',
expect load('base') . <<"EOF"; expect load('base') . <<"EOF";
iface vmbr0 inet static iface vmbr0 inet static
address $ip address $ip
gateway $gw gateway $gw
bridge-ports eth0 bridge-ports eth0
bridge-stp off bridge-stp off
bridge-fd 0 bridge-fd 0
@ -41,8 +41,8 @@ update_iface('vmbr0',
expect load('with-ipv4') . <<"EOF"; expect load('with-ipv4') . <<"EOF";
iface vmbr0 inet6 static iface vmbr0 inet6 static
address $ip6 address $ip6
gateway $gw6 gateway $gw6
EOF EOF
@ -57,8 +57,8 @@ delete_iface('vmbr0', 'inet');
# bridge ports must now appear in the inet6 block # bridge ports must now appear in the inet6 block
expect load('base') . <<"EOF"; expect load('base') . <<"EOF";
iface vmbr0 inet6 static iface vmbr0 inet6 static
address $ip6 address $ip6
gateway $gw6 gateway $gw6
bridge-ports eth0 bridge-ports eth0
bridge-stp off bridge-stp off
bridge-fd 0 bridge-fd 0

16
test/etc_network_interfaces/t.create_network.pl
View File

@ -25,8 +25,8 @@ my $remoteip2 = '192.168.0.4';
my $vmbr0_part = <<"PART"; my $vmbr0_part = <<"PART";
auto vmbr0 auto vmbr0
iface vmbr0 inet static iface vmbr0 inet static
address 10.0.0.2/24 address 10.0.0.2/24
gateway 10.0.0.1 gateway 10.0.0.1
bridge-ports eth0 bridge-ports eth0
bridge-stp off bridge-stp off
bridge-fd 0 bridge-fd 0
@ -50,8 +50,8 @@ $config->{ifaces}->{eth1} = {
my $eth1_part = <<"PART"; my $eth1_part = <<"PART";
auto eth1 auto eth1
iface eth1 inet static iface eth1 inet static
address $ip address $ip
gateway $gw gateway $gw
PART PART
chomp $eth1_part; chomp $eth1_part;
@ -430,8 +430,8 @@ iface eth0 inet manual
auto eth1 auto eth1
iface eth1 inet6 static iface eth1 inet6 static
address $ip address $ip
gateway $gw gateway $gw
iface eth2 inet manual iface eth2 inet manual
@ -439,8 +439,8 @@ iface eth3 inet manual
auto vmbr0 auto vmbr0
iface vmbr0 inet static iface vmbr0 inet static
address 10.0.0.2/24 address 10.0.0.2/24
gateway 10.0.0.1 gateway 10.0.0.1
bridge-ports eth0 bridge-ports eth0
bridge-stp off bridge-stp off
bridge-fd 0 bridge-fd 0

12
test/etc_network_interfaces/t.ovs_bridge_allow.pl
View File

@ -39,8 +39,8 @@ iface eth3 inet manual
allow-ovs vmbr0 allow-ovs vmbr0
iface vmbr0 inet static iface vmbr0 inet static
address $ip address $ip
gateway $gw gateway $gw
ovs_type OVSBridge ovs_type OVSBridge
/etc/network/interfaces /etc/network/interfaces
@ -66,8 +66,8 @@ iface eth3 inet manual
allow-ovs vmbr0 allow-ovs vmbr0
iface vmbr0 inet static iface vmbr0 inet static
address $ip address $ip
gateway $gw gateway $gw
ovs_type OVSBridge ovs_type OVSBridge
ovs_ports eth1 eth2 ovs_ports eth1 eth2
@ -100,8 +100,8 @@ iface eth2 inet manual
allow-ovs vmbr0 allow-ovs vmbr0
iface vmbr0 inet static iface vmbr0 inet static
address $ip address $ip
gateway $gw gateway $gw
ovs_type OVSBridge ovs_type OVSBridge
ovs_ports eth1 ovs_ports eth1

4
test/etc_network_interfaces/t.parsed_options.pl
View File

@ -18,8 +18,8 @@ iface eth1 inet manual
auto vmbr0 auto vmbr0
iface vmbr0 inet static iface vmbr0 inet static
address 10.0.0.2/24 address 10.0.0.2/24
gateway 10.0.0.1 gateway 10.0.0.1
bridge-ports eth0 bridge-ports eth0
bridge-stp off bridge-stp off
bridge-fd 0 bridge-fd 0

14
test/etc_network_interfaces/t.unknown_order.pl
View File

@ -25,7 +25,7 @@ iface bond0 inet manual
auto bond1 auto bond1
iface bond1 inet static iface bond1 inet static
address 10.10.10.$ip/24 address 10.10.10.$ip/24
bond-slaves eth2 eth3 bond-slaves eth2 eth3
bond-miimon 100 bond-miimon 100
bond-mode balance-alb bond-mode balance-alb
@ -39,25 +39,25 @@ iface bond2 inet manual
# Private networking # Private networking
iface unknown3 inet static iface unknown3 inet static
address 0.0.0.0 address 0.0.0.0
iface unknown4 inet static iface unknown4 inet static
address 0.0.0.0 address 0.0.0.0
iface unknown5 inet static iface unknown5 inet static
address 0.0.0.0 address 0.0.0.0
auto vmbr0 auto vmbr0
iface vmbr0 inet static iface vmbr0 inet static
address 192.168.100.13/24 address 192.168.100.13/24
gateway 192.168.100.1 gateway 192.168.100.1
bridge-ports bond0 bridge-ports bond0
bridge-stp off bridge-stp off
bridge-fd 0 bridge-fd 0
auto unknown6 auto unknown6
iface unknown6 inet static iface unknown6 inet static
address 10.10.11.13/24 address 10.10.11.13/24
pre-up ifconfig bond0 up pre-up ifconfig bond0 up
auto vmbr3 auto vmbr3

20
test/etc_network_interfaces/t.update_network.pl
View File

@ -29,13 +29,13 @@ iface eth0 inet manual
auto eth1 auto eth1
iface eth1 inet static iface eth1 inet static
address $ip address $ip
gateway $gw gateway $gw
auto vmbr0 auto vmbr0
iface vmbr0 inet static iface vmbr0 inet static
address 10.0.0.2/24 address 10.0.0.2/24
gateway 10.0.0.1 gateway 10.0.0.1
bridge-ports eth0 bridge-ports eth0
bridge-stp off bridge-stp off
bridge-fd 0 bridge-fd 0
@ -63,17 +63,17 @@ iface eth0 inet manual
auto eth1 auto eth1
iface eth1 inet static iface eth1 inet static
address $ip address $ip
gateway $gw gateway $gw
iface eth1 inet6 static iface eth1 inet6 static
address $ip6 address $ip6
gateway $gw6 gateway $gw6
auto vmbr0 auto vmbr0
iface vmbr0 inet static iface vmbr0 inet static
address 10.0.0.2/24 address 10.0.0.2/24
gateway 10.0.0.1 gateway 10.0.0.1
bridge-ports eth0 bridge-ports eth0
bridge-stp off bridge-stp off
bridge-fd 0 bridge-fd 0