add support for ubuntu 18.04 (bionic beaver)

[dab.git] / DAB.pm

diff --git a/DAB.pm b/DAB.pm
index 61cf5ad8c77ef0a3620ccac8897ceed1a87086a5..ef441e79f0b2d075399df96e2894cadefc582410 100644 (file)
--- a/DAB.pm
+++ b/DAB.pm
@@ -237,15 +237,15 @@ 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";
     } else {
        die "unknown os type '$ostype'\n";
     }
-    $data .= "lxc.utsname = localhost\n";
-    $data .= "lxc.rootfs = $self->{rootfs}\n";
+    $data .= "lxc.uts.name = localhost\n";
+    $data .= "lxc.rootfs.path = $self->{rootfs}\n";
     
     return $data;
 }
@@ -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' || $suite eq 'ascii') {
+       $suite = 'ascii';
+       $config->{ostype} = "devuan-2.0";
     } elsif ($suite eq 'hardy') { 
        $config->{ostype} = "ubuntu-8.04";
     } elsif ($suite eq 'intrepid') { 
@@ -351,6 +357,10 @@ 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";
+    } elsif ($suite eq 'bionic') {
+       $config->{ostype} = "ubuntu-18.04";
     } else {
        die "unsupported debian suite '$suite'\n";
     }
@@ -385,7 +395,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' || $suite eq 'bionic') {
            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 +463,8 @@ 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' ||
+       $suite eq 'bionic') {
        push @$incl, 'isc-dhcp-client';
        push @$excl, qw(libmodule-build-perl);
     } elsif ($suite eq 'trusty') {
@@ -1018,18 +1029,19 @@ sub closure {
     # first, record provided packages
     __record_provides ($pkginfo, $closure, $list, 1);
 
-    my $pkgs = {};
+    my $pkghash = {};
+    my $pkglist = [];
 
     # then resolve dependencies
     foreach my $pname (@$list) {
-       __closure_single ($pkginfo, $closure, $pkgs, $pname, $self->{excl});
+       __closure_single ($pkginfo, $closure, $pkghash, $pkglist, $pname, $self->{excl});
     }
 
-    return [ keys %$pkgs ];
+    return $pkglist;
 }
 
 sub __closure_single {
-    my ($pkginfo, $closure, $pkgs, $pname, $excl) = @_;
+    my ($pkginfo, $closure, $pkghash, $pkglist, $pname, $excl) = @_;
 
     $pname =~ s/^\s+//;
     $pname =~ s/\s+$//;
@@ -1046,8 +1058,11 @@ sub __closure_single {
     my $url = $info->{url};
 
     $url || die "$pname: no url for package '$pname'";
-    
-    $pkgs->{$pname} = 1;
+
+    if (!$pkghash->{$pname}) {
+       unshift @$pkglist, $pname;
+       $pkghash->{$pname} = 1;
+    }
 
     __record_provides ($pkginfo, $closure, [$pname]) if $info->{provides};
 
@@ -1083,7 +1098,7 @@ sub __closure_single {
 
       #printf (STDERR "$pname: $p --> $found\n");
          
-      __closure_single ($pkginfo, $closure, $pkgs, $found, $excl);
+      __closure_single ($pkginfo, $closure, $pkghash, $pkglist, $found, $excl);
   }
 }
 
@@ -1133,7 +1148,8 @@ 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' ||
+            $suite eq 'bionic') {
        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";
@@ -1161,7 +1177,7 @@ sub bootstrap {
        push @$important, "postfix";
     }
 
-    foreach my $p (keys %$pkginfo) {
+    foreach my $p (sort keys %$pkginfo) {
        next if grep { $p eq $_ } @{$self->{excl}};
        my $pri = $pkginfo->{$p}->{priority};
        next if !$pri;
@@ -1252,8 +1268,8 @@ sub bootstrap {
     # avoid warnings about non-existent resolv.conf
     write_file ("", "$rootdir/etc/resolv.conf", 0644);
 
-    if ($suite eq 'zesty' || $suite eq 'yakkety' ||
-       $suite eq 'xenial' || $suite eq 'wily') {
+    if ($suite eq 'bionic' || $suite eq 'artful' || $suite eq 'zesty' ||
+       $suite eq 'yakkety' || $suite eq 'xenial' || $suite eq 'wily') {
        # no need to configure loopback device
     } else {
        $data = "auto lo\niface lo inet loopback\n";
@@ -1296,7 +1312,7 @@ sub bootstrap {
 
     $self->ve_dpkg ('install', 'mawk');
     $self->ve_dpkg ('install', 'debconf');
-    
+
     # unpack required packages
     foreach my $p (@$required) {
        $self->ve_dpkg ('unpack', $p);