From 9a46a2fc277212f70a09cc5dcbd660f61484ecc0 Mon Sep 17 00:00:00 2001
From: Jan Grewe <jan@faked.org>
Date: Tue, 28 May 2024 20:54:02 +0200
Subject: [PATCH] try installing custom packages without listing them in
 PACKAGES

---
 .gitlab-ci.yml                   | 2 +-
 files/etc/uci-defaults/99_custom | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a04521a..b219c82 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ variables:
   OPENWRT_VERSION: 23.05.3
   FILES: ${CI_PROJECT_DIR}/files
   DEFAULT_PACKAGES: luci
-  EXTRA_PACKAGES: openwisp-config openwisp-monitoring netjson-monitoring
+  EXTRA_PACKAGES: ""
   DISABLED_SERVICES: dnsmasq firewall odhcpd
   EXTRA_IMAGE_NAME: fakedOrg
 
diff --git a/files/etc/uci-defaults/99_custom b/files/etc/uci-defaults/99_custom
index fafe4a8..75b4d93 100644
--- a/files/etc/uci-defaults/99_custom
+++ b/files/etc/uci-defaults/99_custom
@@ -3,6 +3,9 @@
 uci set system.@system[0].hostname='openwrt'
 uci commit system
 
+uci del dhcp.dnsmasq1
+uci commit dhcp
+
 uci batch <<-EOF >/dev/null
   set network.lan.proto=dhcp
   delete network.lan.ipaddr
-- 
GitLab