From: Thomas Lamprecht Date: Wed, 2 Oct 2019 15:25:14 +0000 (+0200) Subject: support Ubuntu 19.10 Eoan X-Git-Url: https://git.proxmox.com/?p=dab.git;a=commitdiff_plain;h=230e44719844b50c52864807beef5944e2331346 support Ubuntu 19.10 Eoan Signed-off-by: Thomas Lamprecht --- diff --git a/DAB.pm b/DAB.pm index b79826e..3d51c1e 100644 --- a/DAB.pm +++ b/DAB.pm @@ -367,6 +367,8 @@ sub new { $config->{ostype} = "ubuntu-18.10"; } elsif ($suite eq 'disco') { $config->{ostype} = "ubuntu-19.04"; + } elsif ($suite eq 'eoan') { + $config->{ostype} = "ubuntu-19.10"; } else { die "unsupported debian suite '$suite'\n"; } @@ -402,7 +404,7 @@ sub new { $suite eq 'xenial' || $suite eq 'wily' || $suite eq 'vivid' || $suite eq 'trusty' || $suite eq 'precise' || $suite eq 'yakkety' || $suite eq 'zesty' || $suite eq 'artful' || $suite eq 'bionic' || - $suite eq 'cosmic' || $suite eq 'disco') { + $suite eq 'cosmic' || $suite eq 'disco' || $suite eq 'eoan' ) { 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"; @@ -471,7 +473,8 @@ sub new { if ($suite eq 'vivid' || $suite eq 'wily' || $suite eq 'xenial' || $suite eq 'yakkety' || $suite eq 'zesty' || $suite eq 'artful' || - $suite eq 'bionic' || $suite eq 'cosmic' || $suite eq 'disco') { + $suite eq 'bionic' || $suite eq 'cosmic' || $suite eq 'disco' || + $suite eq 'eoan') { push @$incl, 'isc-dhcp-client'; push @$excl, qw(libmodule-build-perl); } elsif ($suite eq 'trusty') { @@ -1156,7 +1159,8 @@ sub install_init_script { $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 'artful' || - $suite eq 'bionic' || $suite eq 'cosmic' || $suite eq 'disco') { + $suite eq 'bionic' || $suite eq 'cosmic' || $suite eq 'disco' || + $suite eq 'eoan') { 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"; @@ -1275,7 +1279,8 @@ sub bootstrap { # avoid warnings about non-existent resolv.conf write_file ("", "$rootdir/etc/resolv.conf", 0644); - if ($suite eq 'disco' || $suite eq 'cosmic' || $suite eq 'bionic' || $suite eq 'artful' || + if ($suite eq 'eoan' || $suite eq 'disco' || $suite eq 'cosmic' || + $suite eq 'bionic' || $suite eq 'artful' || $suite eq 'zesty' || $suite eq 'yakkety' || $suite eq 'xenial' || $suite eq 'wily') { # no need to configure loopback device