remove extra space after address && gateway options

only 1 space like all others options

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>

diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm
index 6c1ebf530fb1455ef2652935fd49ba966eddffc1..a4de45a7355ccb15bc04dc2554fbb28c63047caf 100644 (file)
--- a/src/PVE/INotify.pm
+++ b/src/PVE/INotify.pm
@@ -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,

diff --git a/test/etc_network_interfaces/t.bridge-v4-v6.pl b/test/etc_network_interfaces/t.bridge-v4-v6.pl
index 8a8007443fcf7c3e6be541a081d085bb2530ec2b..07c1c03be5bd4103c08b6dc2f6f049b23c36eec4 100644 (file)
--- 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 dbbe3a333151d719cfbcce2f51c86451613d86e4..7705070da1d3728792b6d8adb9602cc248b3ad02 100644 (file)
--- a/test/etc_network_interfaces/t.create_network.pl
+++ b/test/etc_network_interfaces/t.create_network.pl
@@ -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

diff --git a/test/etc_network_interfaces/t.ovs_bridge_allow.pl b/test/etc_network_interfaces/t.ovs_bridge_allow.pl
index 159b7d4d07449992878801357ac85c2bb7db235d..9479ff5af1862d0139ae351f76cb13a91ddf3b09 100644 (file)
--- 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 7a3230277a61d1073eb8b2a00485ea973529cf22..bbb2a271736bac9581cb6597f7fbdbc9f0712752 100644 (file)
--- 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 780c5ec8867db6983a798918ee975a0b91f6dd00..cd8f51be7e974625cfee35194e1f854758faeadf 100644 (file)
--- 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 e205e4fcda782f1087a5ce195f07c51b49de819e..18bba00332f4b55fcccd7903d56956ed9eaf8b91 100644 (file)
--- 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