setup/debian: avoid extra newlines

At the beginning of a file or between sections, if there
have been two newlines already we don't need to add another.

diff --git a/src/PVE/LXC/Setup/Debian.pm b/src/PVE/LXC/Setup/Debian.pm
index 752d670613c5a59641429c0b33e1d38e0404d3bf..07dccfcf459e4063c8af417a80dc4ca654e984b9 100644 (file)
--- a/src/PVE/LXC/Setup/Debian.pm
+++ b/src/PVE/LXC/Setup/Debian.pm
@@ -240,7 +240,7 @@ sub setup_network {
        
     }
 
-    my $need_separator = 1;
+    my $need_separator = length($interfaces) && ($interfaces !~ /\n\n$/);
     foreach my $ifname (sort keys %$networks) {
        my $net = $networks->{$ifname};
        

diff --git a/src/test/test-debian-002/etc/network/interfaces.exp b/src/test/test-debian-002/etc/network/interfaces.exp
index d8f9f5c879a8e6fbdfb5607b5edf63a84f2107ff..9d9dbcca0848c9c9187816b85583121defefaaf7 100644 (file)
--- a/src/test/test-debian-002/etc/network/interfaces.exp
+++ b/src/test/test-debian-002/etc/network/interfaces.exp
@@ -1,4 +1,3 @@
-
 auto eth0
 iface eth0 inet static
        address 1.2.3.4