remove Data::Dumper usages

[pve-container.git] / src / PVE / LXC / Setup / Debian.pm

diff --git a/src/PVE/LXC/Setup/Debian.pm b/src/PVE/LXC/Setup/Debian.pm
index d7e710273f15ddbd97f61066bb8ef3b0316cf883..50398892e512f695c79df4245c303caac618fe2b 100644 (file)
--- a/src/PVE/LXC/Setup/Debian.pm
+++ b/src/PVE/LXC/Setup/Debian.pm
@@ -2,7 +2,7 @@ package PVE::LXC::Setup::Debian;
 
 use strict;
 use warnings;
-use Data::Dumper;
+
 use PVE::Tools qw($IPV6RE);
 use PVE::LXC;
 use PVE::Network;
@@ -19,8 +19,9 @@ sub new {
 
     die "unable to read version info\n" if !defined($version);
 
-    # translate stretch/sid => 9.0 (used on debian testing repository)
-    $version = 9.0 if $version eq 'stretch/sid';
+    # translate testing version names
+    $version = 9.1 if $version eq 'stretch/sid';
+    $version = 10 if $version eq 'buster/sid';
 
     die "unable to parse version info '$version'\n"
        if $version !~ m/^(\d+(\.\d+)?)(\.\d+)?/;
@@ -28,7 +29,7 @@ sub new {
     $version = $1;
 
     die "unsupported debian version '$version'\n"
-       if !($version >= 4 && $version <= 9);
+       if !($version >= 4 && $version <= 10);
 
     my $self = { conf => $conf, rootdir => $rootdir, version => $version };
 
@@ -37,12 +38,17 @@ sub new {
     return bless $self, $class;
 }
 
+# Debian doesn't support the /dev/lxc/ subdirectory.
+sub devttydir {
+    return '';
+}
+
 sub setup_init {
     my ($self, $conf) = @_;
 
     my $systemd = $self->ct_readlink('/sbin/init');
     if (defined($systemd) && $systemd =~ m@/systemd$@) {
-       $self->setup_container_getty_service(1);
+       $self->setup_container_getty_service($conf);
     }
 
     my $filename = "/etc/inittab";
@@ -53,7 +59,7 @@ sub setup_init {
 
     my @lines = grep {
            # remove getty lines
-           !/^\s*\d+:\d+:[^:]*:.*getty/ &&
+           !/^\s*\d+:\d*:[^:]*:.*getty/ &&
            # remove power lines
            !/^\s*p[fno0]:/
        } split(/\n/, $inittab);
@@ -209,8 +215,10 @@ sub setup_network {
        if ($section->{type} eq 'ipv4') {
            $done_v4_hash->{$ifname} = 1;
 
-           if (defined($net->{address}) && $net->{address} =~ /^(dhcp|manual)$/) {
-               $interfaces .= "iface $ifname inet $1\n";
+           if (!defined($net->{address})) {
+               # no address => no iface line
+           } elsif ($net->{address} =~ /^(dhcp|manual)$/) {
+               $interfaces .= "iface $ifname inet $1\n\n";
            } else {
                $interfaces .= "iface $ifname inet static\n";
                $interfaces .= "\taddress $net->{address}\n" if defined($net->{address});
@@ -227,15 +235,15 @@ sub setup_network {
                foreach my $attr (@{$section->{attr}}) {
                    $interfaces .= "\t$attr\n";
                }
+               $interfaces .= "\n";
            }
-
-           $interfaces .= "\n";
-
        } elsif ($section->{type} eq 'ipv6') {
            $done_v6_hash->{$ifname} = 1;
 
-           if (defined($net->{address6}) && $net->{address6} =~ /^(auto|dhcp|manual)$/) {
-               $interfaces .= "iface $ifname inet6 $1\n";
+           if (!defined($net->{address6})) {
+               # no address => no iface line
+           } elsif ($net->{address6} =~ /^(auto|dhcp|manual)$/) {
+               $interfaces .= "iface $ifname inet6 $1\n\n";
            } else {
                $interfaces .= "iface $ifname inet6 static\n";
                $interfaces .= "\taddress $net->{address6}\n" if defined($net->{address6});
@@ -251,9 +259,8 @@ sub setup_network {
                foreach my $attr (@{$section->{attr}}) {
                    $interfaces .= "\t$attr\n";
                }
+               $interfaces .= "\n";
            }
-
-           $interfaces .= "\n";
        } else {
            die "unknown section type '$section->{type}'";
        }