[pve-devel] [pve-common 2/3] remove extra space after address && gateway options
Alexandre Derumier
aderumier at odiso.com
Thu Feb 20 12:55:19 CET 2020
only 1 space like all others options
Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
---
src/PVE/INotify.pm | 4 ++--
test/etc_network_interfaces/t.bridge-v4-v6.pl | 12 +++++------
.../t.create_network.pl | 16 +++++++--------
.../t.ovs_bridge_allow.pl | 12 +++++------
.../t.parsed_options.pl | 4 ++--
.../etc_network_interfaces/t.unknown_order.pl | 14 ++++++-------
.../t.update_network.pl | 20 +++++++++----------
7 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm
index aefdeac..e9dc485 100644
--- a/src/PVE/INotify.pm
+++ b/src/PVE/INotify.pm
@@ -1168,8 +1168,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,
diff --git a/test/etc_network_interfaces/t.bridge-v4-v6.pl b/test/etc_network_interfaces/t.bridge-v4-v6.pl
index 8a80074..07c1c03 100644
--- a/test/etc_network_interfaces/t.bridge-v4-v6.pl
+++ b/test/etc_network_interfaces/t.bridge-v4-v6.pl
@@ -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
diff --git a/test/etc_network_interfaces/t.create_network.pl b/test/etc_network_interfaces/t.create_network.pl
index 0ff6a29..9bb26bd 100644
--- a/test/etc_network_interfaces/t.create_network.pl
+++ b/test/etc_network_interfaces/t.create_network.pl
@@ -27,8 +27,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
@@ -52,8 +52,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;
@@ -503,8 +503,8 @@ iface eth0 inet manual
auto eth1
iface eth1 inet6 static
- address $ip
- gateway $gw
+ address $ip
+ gateway $gw
iface eth2 inet manual
@@ -516,8 +516,8 @@ iface eth5 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
diff --git a/test/etc_network_interfaces/t.ovs_bridge_allow.pl b/test/etc_network_interfaces/t.ovs_bridge_allow.pl
index 159b7d4..9479ff5 100644
--- a/test/etc_network_interfaces/t.ovs_bridge_allow.pl
+++ b/test/etc_network_interfaces/t.ovs_bridge_allow.pl
@@ -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
diff --git a/test/etc_network_interfaces/t.parsed_options.pl b/test/etc_network_interfaces/t.parsed_options.pl
index 7a32302..bbb2a27 100644
--- a/test/etc_network_interfaces/t.parsed_options.pl
+++ b/test/etc_network_interfaces/t.parsed_options.pl
@@ -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
diff --git a/test/etc_network_interfaces/t.unknown_order.pl b/test/etc_network_interfaces/t.unknown_order.pl
index 780c5ec..cd8f51b 100644
--- a/test/etc_network_interfaces/t.unknown_order.pl
+++ b/test/etc_network_interfaces/t.unknown_order.pl
@@ -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
diff --git a/test/etc_network_interfaces/t.update_network.pl b/test/etc_network_interfaces/t.update_network.pl
index e205e4f..18bba00 100644
--- a/test/etc_network_interfaces/t.update_network.pl
+++ b/test/etc_network_interfaces/t.update_network.pl
@@ -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
--
2.20.1
More information about the pve-devel
mailing list