From 07b7c642de304392e034e035e4c39ccfe1f8c78d Mon Sep 17 00:00:00 2001 From: Daniel Nilsson Date: Wed, 1 May 2024 22:17:43 +0200 Subject: luci-app-lxc: remove bypassing GPG validation Since https://github.com/lxc/lxc/commit/58520263041b6864cadad96278848f9b8ce78ee9 which is part of LXC 5.0, not being able to bypass GPG validation anymore has been enforced by upstream in lxc-download. When LXC was bumped to 5.0.1 in https://github.com/openwrt/packages/commit/d957a2293b2a21b1edca1aa92e141bad8292251a this broke passing the --no-validate option to lxc-download, which resulted in getting the output of the --help command line option as the RPC output of lxc-download as it doesn't understand the --no-validate option. This in turn broke the string parsing for compatible distributions and their versions. To solve this, this commit removes the --no-validate option entirely as it has been removed by upstream. Signed-off-by: Daniel Nilsson --- applications/luci-app-lxc/luasrc/model/cbi/lxc.lua | 5 ----- 1 file changed, 5 deletions(-) (limited to 'applications/luci-app-lxc/luasrc/model') diff --git a/applications/luci-app-lxc/luasrc/model/cbi/lxc.lua b/applications/luci-app-lxc/luasrc/model/cbi/lxc.lua index 2987fced13..df3f79ec48 100644 --- a/applications/luci-app-lxc/luasrc/model/cbi/lxc.lua +++ b/applications/luci-app-lxc/luasrc/model/cbi/lxc.lua @@ -28,11 +28,6 @@ o1:value("repo.turris.cz/lxc", "repo.turris.cz/lxc (SSL req.)") o1.default = "images.linuxcontainers.org" o1.rmempty = false -o2 = s:option(Flag, "ssl_enabled", translate("Enable SSL"), - translate("Enable optional SSL encryption support. This requires additional packages like 'wget', 'ca-certificates', 'gnupg' and 'gnupg-utils'.")) -o2.default = o2.disabled -o2.rmempty = false - o3 = s:option(Value, "min_space", translate("Free Space Threshold"), translate("Minimum required free space for LXC Container creation in KB")) o3.default = "100000" -- cgit v1.2.3