From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Thu, 15 Feb 2018 12:16:34 +0000 (+0100)
Subject: close #1668: add support for devuan jessie and ascii
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;ds=sidebyside;h=b5583827a5dac915c61fcc539c15b20a380b0b29;hp=a81cc6a57dba60f486c415acbe4d253493c6187a;p=dab.git

close #1668: add support for devuan jessie and ascii

Use devuan-jessie as suite name to avoid conflict.
Allow both versions for Devuan ascii.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---

diff --git a/DAB.pm b/DAB.pm
index b00368a..dafae9f 100644
--- 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') {