From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <o.bektas@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 4B6787D174
for <pve-devel@lists.proxmox.com>; Mon, 8 Nov 2021 14:44:38 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 132CA26886
for <pve-devel@lists.proxmox.com>; Mon, 8 Nov 2021 14:44:08 +0100 (CET)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id 21FE82684E
for <pve-devel@lists.proxmox.com>; Mon, 8 Nov 2021 14:44:07 +0100 (CET)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id EDF85435ED
for <pve-devel@lists.proxmox.com>; Mon, 8 Nov 2021 14:44:06 +0100 (CET)
From: Oguz Bektas <o.bektas@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Mon, 8 Nov 2021 14:43:59 +0100
Message-Id: <20211108134400.1884660-2-o.bektas@proxmox.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20211108134400.1884660-1-o.bektas@proxmox.com>
References: <20211108134400.1884660-1-o.bektas@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.834 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
Subject: [pve-devel] [PATCH container 1/2] fix #2044: add openwrt support
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Mon, 08 Nov 2021 13:44:38 -0000
---
src/PVE/LXC/Setup.pm | 4 ++
src/PVE/LXC/Setup/Makefile | 1 +
src/PVE/LXC/Setup/OpenWrt.pm | 82 ++++++++++++++++++++++++++++++++++++
3 files changed, 87 insertions(+)
create mode 100644 src/PVE/LXC/Setup/OpenWrt.pm
diff --git a/src/PVE/LXC/Setup.pm b/src/PVE/LXC/Setup.pm
index 5cc56af..e89886f 100644
--- a/src/PVE/LXC/Setup.pm
+++ b/src/PVE/LXC/Setup.pm
@@ -17,6 +17,7 @@ use PVE::LXC::Setup::Fedora;
use PVE::LXC::Setup::Gentoo;
use PVE::LXC::Setup::SUSE;
use PVE::LXC::Setup::Ubuntu;
+use PVE::LXC::Setup::OpenWrt;
use PVE::LXC::Setup::Unmanaged;
my $plugins = {
@@ -28,6 +29,7 @@ my $plugins = {
fedora => 'PVE::LXC::Setup::Fedora',
gentoo => 'PVE::LXC::Setup::Gentoo',
opensuse => 'PVE::LXC::Setup::SUSE',
+ openwrt => 'PVE::LXC::Setup::OpenWrt',
ubuntu => 'PVE::LXC::Setup::Ubuntu',
unmanaged => 'PVE::LXC::Setup::Unmanaged',
};
@@ -75,6 +77,8 @@ my $autodetect_type = sub {
return "alpine";
} elsif (-f "$rootdir/etc/gentoo-release") {
return "gentoo";
+ } elsif (-f "$rootdir/etc/openwrt_release") {
+ return "openwrt";
} elsif (-f "$rootdir/etc/os-release") {
die "unable to detect OS distribution\n";
} else {
diff --git a/src/PVE/LXC/Setup/Makefile b/src/PVE/LXC/Setup/Makefile
index 04ee2e4..22702ca 100644
--- a/src/PVE/LXC/Setup/Makefile
+++ b/src/PVE/LXC/Setup/Makefile
@@ -9,6 +9,7 @@ SOURCES=\
Fedora.pm \
Gentoo.pm \
SUSE.pm \
+ OpenWrt.pm \
Ubuntu.pm \
Unmanaged.pm \
diff --git a/src/PVE/LXC/Setup/OpenWrt.pm b/src/PVE/LXC/Setup/OpenWrt.pm
new file mode 100644
index 0000000..89ea740
--- /dev/null
+++ b/src/PVE/LXC/Setup/OpenWrt.pm
@@ -0,0 +1,82 @@
+package PVE::LXC::Setup::OpenWrt;
+
+use strict;
+use warnings;
+
+use PVE::LXC;
+use PVE::Network;
+use File::Path;
+
+use PVE::LXC::Setup::Base;
+use base qw(PVE::LXC::Setup::Base);
+
+my $known_versions = {
+ '21.02.1' => 1,
+};
+
+sub new {
+ my ($class, $conf, $rootdir) = @_;
+
+ my $version;
+ my $release = PVE::Tools::file_get_contents("$rootdir/etc/openwrt_release");
+ if ($release =~ m/^DISTRIB_RELEASE=\'(\d+\.\d+\.\d+)\'$/mi) {
+ $version = $1;
+ }
+ die "unsupported OpenWrt version '$version'\n"
+ if !$known_versions->{$version};
+
+ my $self = { conf => $conf, rootdir => $rootdir, version => $version };
+
+ $conf->{ostype} = "openwrt";
+
+ return bless $self, $class;
+}
+
+sub template_fixup {
+ my ($self, $conf) = @_;
+}
+
+sub setup_init {
+ my ($self, $conf) = @_;
+}
+
+sub setup_network {
+ my ($self, $conf) = @_;
+
+ my $d;
+ foreach my $k (keys %$conf) {
+ next if $k !~ m/^net(\d+)$/;
+ $d = PVE::LXC::Config->parse_lxc_network($conf->{$k});
+ next if !$d->{name};
+ }
+
+ my $proto = ($d->{ip} eq 'dhcp') ? 'dhcp' : 'static';
+ my $ip = "";
+ if ($proto eq 'static') {
+ $ip = $d->{ip};
+ }
+
+ my $data = <<"DATA";
+config interface 'loopback'
+ option proto 'static'
+ option ipaddr '127.0.0.1'
+ option netmask '255.0.0.0'
+ option device 'lo'
+
+config interface 'wan'
+ option proto '$proto'
+ option device '$d->{name}'
+ option ipaddr '$ip'
+ option netmask '255.255.255.0'
+DATA
+ $self->ct_file_set_contents("/etc/config/network", $data);
+}
+
+# non systemd based containers work with pure cgroupv2
+sub unified_cgroupv2_support {
+ my ($self) = @_;
+
+ return 1;
+}
+
+1
--
2.30.2