From 281483b6a6a47c0c2e8d21fc5f3a736543d35be3 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Wed, 20 Apr 2016 11:14:47 +0200 Subject: [PATCH] add support for ubuntu xenial, bump version to 2.0-4 --- DAB.pm | 11 +++++++---- Makefile | 2 +- changelog.Debian | 6 ++++++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/DAB.pm b/DAB.pm index 796c2ed..0f6b993 100644 --- a/DAB.pm +++ b/DAB.pm @@ -343,6 +343,8 @@ sub new { $config->{ostype} = "ubuntu-15.04"; } elsif ($suite eq 'wily') { $config->{ostype} = "ubuntu-15.10"; + } elsif ($suite eq 'xenial') { + $config->{ostype} = "ubuntu-16.04"; } else { die "unsupported debian suite '$suite'\n"; } @@ -373,7 +375,8 @@ sub new { if ($suite eq 'squeeze' || $suite eq 'wheezy' || $suite eq 'jessie'); push @{$config->{source}}, "http://security.debian.org SUITE/updates main contrib"; } elsif ($suite eq 'hardy' || $suite eq 'intrepid' || $suite eq 'jaunty' || - $suite eq 'wily' || $suite eq 'vivid' || $suite eq 'trusty' || $suite eq 'precise') { + $suite eq 'xenial' || $suite eq 'wily' || $suite eq 'vivid' || + $suite eq 'trusty' || $suite eq 'precise') { 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"; @@ -440,7 +443,7 @@ sub new { # ubuntu has too many dependencies on udev, so # we cannot exclude it (instead we disable udevd) - if ($suite eq 'vivid' || $suite eq 'wily') { + if ($suite eq 'vivid' || $suite eq 'wily' || $suite eq 'xenial') { push @$incl, 'isc-dhcp-client'; push @$excl, qw(libmodule-build-perl); } elsif ($suite eq 'trusty') { @@ -1111,7 +1114,7 @@ sub install_init_script { $self->run_command ("install -m 0755 '$script' '$target'"); if ($suite eq 'etch' || $suite eq 'lenny') { $self->ve_command ("update-rc.d $base start $prio $runlevel ."); - } elsif ($suite eq 'wily' || $suite eq 'vivid') { + } elsif ($suite eq 'xenial' || $suite eq 'wily' || $suite eq 'vivid') { 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"; @@ -1230,7 +1233,7 @@ sub bootstrap { # avoid warnings about non-existent resolv.conf write_file ("", "$rootdir/etc/resolv.conf", 0644); - if ($suite eq 'wily') { + if ($suite eq 'xenial' || $suite eq 'wily') { # no need to configure loopback device } else { $data = "auto lo\niface lo inet loopback\n"; diff --git a/Makefile b/Makefile index 2014e28..6a34606 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ RELEASE=4.0 VERSION=2.0 PACKAGE=dab -PKGREL=3 +PKGREL=4 SCRIPTS= \ diff --git a/changelog.Debian b/changelog.Debian index 92f8b1a..de655e7 100644 --- a/changelog.Debian +++ b/changelog.Debian @@ -1,3 +1,9 @@ +dab (2.0-4) unstable; urgency=medium + + * add support for ubuntu xenial + + -- Proxmox Support Team Wed, 20 Apr 2016 11:14:30 +0200 + dab (2.0-3) unstable; urgency=medium * add support for ubuntu wily -- 2.39.2