bump version toö 3.0-8

[dab.git] / DAB.pm

diff --git a/DAB.pm b/DAB.pm
index 2f4a4f5fc93ed3273cd7974d6a6a57295e3bbaea..dafae9fd11823d50cd90ab1a8832dccf1108ad6e 100644 (file)
--- a/DAB.pm
+++ b/DAB.pm
@@ -237,7 +237,7 @@ sub __sample_config {
 
     my $ostype = $self->{config}->{ostype};
 
-    if ($ostype =~ m/^debian-/) {
+    if ($ostype =~ m/^de(bi|vu)an-/) {
        $data .= "lxc.include = /usr/share/lxc/config/debian.common.conf\n";
     } elsif ($ostype =~ m/^ubuntu-/) {
        $data .= "lxc.include = /usr/share/lxc/config/ubuntu.common.conf\n";
@@ -331,6 +331,12 @@ sub new {
        $config->{ostype} = "debian-5.0";
     } elsif ($suite eq 'etch') { 
        $config->{ostype} = "debian-4.0";
+    } elsif ($suite eq 'devuan-jessie') {
+       $suite = 'jessie';
+       $config->{ostype} = "devuan-1.0";
+    } elsif ($suite eq 'devuan-ascii' || 'ascii') {
+       $suite = 'ascii';
+       $config->{ostype} = "devuan-2.0";
     } elsif ($suite eq 'hardy') { 
        $config->{ostype} = "ubuntu-8.04";
     } elsif ($suite eq 'intrepid') { 
@@ -351,6 +357,8 @@ sub new {
        $config->{ostype} = "ubuntu-16.10";
     } elsif ($suite eq 'zesty') {
        $config->{ostype} = "ubuntu-17.04";
+    } elsif ($suite eq 'artful') {
+       $config->{ostype} = "ubuntu-17.10";
     } else {
        die "unsupported debian suite '$suite'\n";
     }
@@ -385,7 +393,7 @@ sub new {
        } elsif ($suite eq 'hardy' || $suite eq 'intrepid' || $suite eq 'jaunty' ||
                 $suite eq 'xenial' || $suite eq 'wily' || $suite eq 'vivid' ||
                 $suite eq 'trusty' || $suite eq 'precise' || $suite eq 'yakkety' ||
-                $suite eq 'zesty') {
+                $suite eq 'zesty' || $suite eq 'artful' ) {
            my $comp = "main restricted universe multiverse";
            push @{$config->{source}}, "http://archive.ubuntu.com/ubuntu SUITE $comp"; 
            push @{$config->{source}}, "http://archive.ubuntu.com/ubuntu SUITE-updates $comp"; 
@@ -453,7 +461,7 @@ sub new {
     # we cannot exclude it (instead we disable udevd)
 
     if ($suite eq 'vivid' || $suite eq 'wily' || $suite eq 'xenial' ||
-       $suite eq 'yakkety' || $suite eq 'zesty') {
+       $suite eq 'yakkety' || $suite eq 'zesty' || $suite eq 'artful') {
        push @$incl, 'isc-dhcp-client';
        push @$excl, qw(libmodule-build-perl);
     } elsif ($suite eq 'trusty') {
@@ -1137,7 +1145,7 @@ sub install_init_script {
     if ($suite eq 'etch' || $suite eq 'lenny') {
        $self->ve_command ("update-rc.d $base start $prio $runlevel .");
     } elsif ($suite eq 'xenial' || $suite eq 'wily' || $suite eq 'vivid' ||
-            $suite eq 'yakkety' || $suite eq 'zesty') {
+            $suite eq 'yakkety' || $suite eq 'zesty' || $suite eq 'artful') {
        die "unable to install init script (system uses systemd)\n";
     } elsif ($suite eq 'trusty' || $suite eq 'precise') {
        die "unable to install init script (system uses upstart)\n";
@@ -1256,7 +1264,7 @@ sub bootstrap {
     # avoid warnings about non-existent resolv.conf
     write_file ("", "$rootdir/etc/resolv.conf", 0644);
 
-    if ($suite eq 'zesty' || $suite eq 'yakkety' ||
+    if ($suite eq 'artful' || $suite eq 'zesty' || $suite eq 'yakkety' ||
        $suite eq 'xenial' || $suite eq 'wily') {
        # no need to configure loopback device
     } else {