add support for Ubuntu 21.04 Hirsute

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-04-25 17:36:10 +02:00
parent c0ed1345f3
commit 73c34b52a9

15
DAB.pm
View File

@ -167,6 +167,10 @@ my $supported_suites = {
ostype => "ubuntu-20.10", ostype => "ubuntu-20.10",
origin => 'ubuntu', origin => 'ubuntu',
}, },
'hirsute' => {
ostype => "ubuntu-21.04",
origin => 'ubuntu',
},
}; };
sub get_suite_info { sub get_suite_info {
@ -560,7 +564,9 @@ sub new {
if ($suite eq 'vivid' || $suite eq 'wily' || $suite eq 'xenial' || if ($suite eq 'vivid' || $suite eq 'wily' || $suite eq 'xenial' ||
$suite eq 'yakkety' || $suite eq 'zesty' || $suite eq 'artful' || $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' || $suite eq 'focal' || $suite eq 'groovy') { $suite eq 'eoan' || $suite eq 'focal' || $suite eq 'groovy'
|| $suite eq 'hirsute'
) {
push @$incl, 'isc-dhcp-client'; push @$incl, 'isc-dhcp-client';
push @$excl, qw(libmodule-build-perl); push @$excl, qw(libmodule-build-perl);
} elsif ($suite eq 'trusty') { } elsif ($suite eq 'trusty') {
@ -1279,7 +1285,9 @@ sub install_init_script {
} elsif ($suite eq 'xenial' || $suite eq 'wily' || $suite eq 'vivid' || } elsif ($suite eq 'xenial' || $suite eq 'wily' || $suite eq 'vivid' ||
$suite eq 'yakkety' || $suite eq 'zesty' || $suite eq 'artful' || $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' || $suite eq 'focal' || $suite eq 'groovy') { $suite eq 'eoan' || $suite eq 'focal' || $suite eq 'groovy'
|| $suite eq 'hirsute'
) {
die "unable to install init script (system uses systemd)\n"; die "unable to install init script (system uses systemd)\n";
} elsif ($suite eq 'trusty' || $suite eq 'precise') { } elsif ($suite eq 'trusty' || $suite eq 'precise') {
die "unable to install init script (system uses upstart)\n"; die "unable to install init script (system uses upstart)\n";
@ -1398,7 +1406,8 @@ sub bootstrap {
# avoid warnings about non-existent resolv.conf # avoid warnings about non-existent resolv.conf
write_file ("", "$rootdir/etc/resolv.conf", 0644); write_file ("", "$rootdir/etc/resolv.conf", 0644);
if ($suite eq 'groovy' || $suite eq 'focal' || if (
$suite eq 'hirsute' || $suite eq 'groovy' || $suite eq 'focal' ||
$suite eq 'eoan' || $suite eq 'disco' || $suite eq 'cosmic' || $suite eq 'eoan' || $suite eq 'disco' || $suite eq 'cosmic' ||
$suite eq 'bionic' || $suite eq 'artful' || $suite eq 'bionic' || $suite eq 'artful' ||
$suite eq 'zesty' || $suite eq 'yakkety' || $suite eq 'xenial' || $suite eq 'zesty' || $suite eq 'yakkety' || $suite eq 'xenial' ||