From 5303d729188b3e5e0bf75abb686943f59a5602c9 Mon Sep 17 00:00:00 2001 From: Alexey Vazhnov Date: Sun, 29 Nov 2020 11:49:04 +0000 Subject: [PATCH] Remove workaround for /etc/devuan_version /etc/debian_version after https://bugzilla.proxmox.com/show_bug.cgi?id=3096 was applied. --- README.md | 7 ------- devuan-1.0-standard-64/Makefile | 1 - devuan-1.0-standard-64/dab.conf | 2 +- devuan-2.1-standard-64/Makefile | 1 - devuan-2.1-standard-64/dab.conf | 2 +- devuan-3.0-minimal-64/Makefile | 1 - devuan-3.0-minimal-64/dab.conf | 2 +- devuan-3.0-standard-64/Makefile | 1 - devuan-3.0-standard-64/dab.conf | 2 +- devuan-4.0-minimal-64/Makefile | 2 -- devuan-4.0-minimal-64/dab.conf | 2 +- 11 files changed, 5 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 8c456f9..04a04d4 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,6 @@ Devuan Virtual Appliances for [Proxmox Virtual Environment](https://proxmox.com/ Proxmox supports Devuan starting from Proxmox VE v5.1 (released 24.10.2017). * Devuan 1 Jessie (based on Debian 8) - -With workaround, it supports newer Devuan versions: - * Devuan 2.1 ASCII (based on Debian 9 Stretch / 2017-06) * Devuan 3 Beowulf (based on Debian 10 Buster / 2019-07) * Devuan 4 Chimaera (based on Debian testing 11 Bullseye, TBD in 2021) @@ -18,10 +15,6 @@ See git repository [dab-pve-appliances](https://git.proxmox.com/?p=dab-pve-appli ## Usage -### Use ready-to-use template - -Download the [ready-to-use template](https://github.com/siddolo/pve-devuan-appliances/releases) and upload it into Proxmox using the web interface or copy it into Proxmox template directory (for example `/rpool/template/cache/` or `/var/lib/vz/template/cache`). - ### Build Devuan template using DAB (Debian Appliance Builder) ```shell diff --git a/devuan-1.0-standard-64/Makefile b/devuan-1.0-standard-64/Makefile index e9a6229..e2620ee 100644 --- a/devuan-1.0-standard-64/Makefile +++ b/devuan-1.0-standard-64/Makefile @@ -3,7 +3,6 @@ BASEDIR:=$(shell dab basedir) all: info/init_ok dab bootstrap dab install devuan-keyring - dab exec bash -c "echo 8.0 > /etc/debian_version" dab finalize info/init_ok: dab.conf diff --git a/devuan-1.0-standard-64/dab.conf b/devuan-1.0-standard-64/dab.conf index b2c2ef7..9e00400 100644 --- a/devuan-1.0-standard-64/dab.conf +++ b/devuan-1.0-standard-64/dab.conf @@ -5,7 +5,7 @@ Source: http://auto.mirror.devuan.org/merged SUITE-updates main contrib Source: http://auto.mirror.devuan.org/merged SUITE-security main contrib Architecture: amd64 Name: devuan-1.0-standard -Version: 1.0 +Version: 1.1 Section: system Maintainer: Pasquale Fiorillo Infopage: https://devuan.org diff --git a/devuan-2.1-standard-64/Makefile b/devuan-2.1-standard-64/Makefile index 07e04b9..e2620ee 100644 --- a/devuan-2.1-standard-64/Makefile +++ b/devuan-2.1-standard-64/Makefile @@ -3,7 +3,6 @@ BASEDIR:=$(shell dab basedir) all: info/init_ok dab bootstrap dab install devuan-keyring - dab exec bash -c "echo 9.0 > /etc/debian_version" dab finalize info/init_ok: dab.conf diff --git a/devuan-2.1-standard-64/dab.conf b/devuan-2.1-standard-64/dab.conf index ef18315..32c7ff4 100644 --- a/devuan-2.1-standard-64/dab.conf +++ b/devuan-2.1-standard-64/dab.conf @@ -5,7 +5,7 @@ Source: http://deb.devuan.org/merged SUITE-updates main contrib Source: http://deb.devuan.org/merged SUITE-security main contrib Architecture: amd64 Name: devuan-2.1-standard -Version: 1.0 +Version: 1.1 Section: system Maintainer: Alexey Vazhnov Infopage: https://devuan.org diff --git a/devuan-3.0-minimal-64/Makefile b/devuan-3.0-minimal-64/Makefile index 12e5acd..456b3b8 100644 --- a/devuan-3.0-minimal-64/Makefile +++ b/devuan-3.0-minimal-64/Makefile @@ -3,7 +3,6 @@ BASEDIR:=$(shell dab basedir) all: info/init_ok dab bootstrap --minimal dab install devuan-keyring - dab exec bash -c "echo 10.0 > /etc/debian_version" dab finalize info/init_ok: dab.conf diff --git a/devuan-3.0-minimal-64/dab.conf b/devuan-3.0-minimal-64/dab.conf index 5a915d6..0318c83 100644 --- a/devuan-3.0-minimal-64/dab.conf +++ b/devuan-3.0-minimal-64/dab.conf @@ -5,7 +5,7 @@ Source: http://deb.devuan.org/merged beowulf-updates main contrib Source: http://deb.devuan.org/merged beowulf-security main contrib Architecture: amd64 Name: devuan-3.0-minimal -Version: 1.2 +Version: 1.3 Section: system Maintainer: Alexey Vazhnov Infopage: https://devuan.org diff --git a/devuan-3.0-standard-64/Makefile b/devuan-3.0-standard-64/Makefile index 0baeb0d..8bcd74d 100644 --- a/devuan-3.0-standard-64/Makefile +++ b/devuan-3.0-standard-64/Makefile @@ -3,7 +3,6 @@ BASEDIR:=$(shell dab basedir) all: info/init_ok dab bootstrap dab install devuan-keyring - dab exec bash -c "echo 10.0 > /etc/debian_version" dab exec apt-get -y purge x11-apps x11-common x11-session-utils x11-utils x11-xkb-utils x11-xserver-utils libgl1-mesa-dri libglapi-mesa libglx-mesa0 libllvm7 dab finalize diff --git a/devuan-3.0-standard-64/dab.conf b/devuan-3.0-standard-64/dab.conf index 55d9bda..bfa8deb 100644 --- a/devuan-3.0-standard-64/dab.conf +++ b/devuan-3.0-standard-64/dab.conf @@ -5,7 +5,7 @@ Source: http://deb.devuan.org/merged beowulf-updates main contrib Source: http://deb.devuan.org/merged beowulf-security main contrib Architecture: amd64 Name: devuan-3.0-standard -Version: 1.2 +Version: 1.3 Section: system Maintainer: Alexey Vazhnov Infopage: https://devuan.org diff --git a/devuan-4.0-minimal-64/Makefile b/devuan-4.0-minimal-64/Makefile index a9bc4f8..456b3b8 100644 --- a/devuan-4.0-minimal-64/Makefile +++ b/devuan-4.0-minimal-64/Makefile @@ -3,8 +3,6 @@ BASEDIR:=$(shell dab basedir) all: info/init_ok dab bootstrap --minimal dab install devuan-keyring - # Workaround to avoid: unable to create CT 100 - unsupported Devuan version 'chimaera/ceres' - dab exec bash -c "echo ascii > /etc/devuan_version" dab finalize info/init_ok: dab.conf diff --git a/devuan-4.0-minimal-64/dab.conf b/devuan-4.0-minimal-64/dab.conf index bc6abf3..5577786 100644 --- a/devuan-4.0-minimal-64/dab.conf +++ b/devuan-4.0-minimal-64/dab.conf @@ -5,7 +5,7 @@ Source: http://deb.devuan.org/merged chimaera-updates main contrib # Source: http://deb.devuan.org/merged chimaera-security main contrib Architecture: amd64 Name: devuan-4.0-minimal -Version: 0.9 +Version: 1.0 Section: system Maintainer: Alexey Vazhnov Infopage: https://devuan.org