using override.d

16 files changed, 20 insertions, 14 deletions

diff --git a/Makefile b/Makefile
index 0b703642..2ce67620 100644
--- a/Makefile
+++ b/Makefile
@@ -85,6 +85,7 @@ tox: testenv
 			&& cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \
 			&& cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \
 			&& cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \
+			&& mkdir -p /etc/kvmd/override.d \
 			&& cp /src/testenv/$(if $(P),$(P),$(DEFAULT_PLATFORM)).override.yaml /etc/kvmd/override.yaml \
 			&& cd /src \
 			&& $(if $(CMD),$(CMD),tox -q -c testenv/tox.ini $(if $(E),-e $(E),-p auto)) \
@@ -126,6 +127,7 @@ run: testenv $(TESTENV_GPIO)
 			&& cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \
 			&& cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \
 			&& cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \
+			&& mkdir -p /etc/kvmd/override.d \
 			&& cp /testenv/$(if $(P),$(P),$(DEFAULT_PLATFORM)).override.yaml /etc/kvmd/override.yaml \
 			&& cp /usr/share/kvmd/configs.default/kvmd/web.css /etc/kvmd \
 			&& nginx -c /etc/kvmd/nginx/nginx.conf -g 'user http; error_log stderr;' \
@@ -149,6 +151,7 @@ run-cfg: testenv
 			&& cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \
 			&& cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \
 			&& cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \
+			&& mkdir -p /etc/kvmd/override.d \
 			&& cp /testenv/$(if $(P),$(P),$(DEFAULT_PLATFORM)).override.yaml /etc/kvmd/override.yaml \
 			&& $(if $(CMD),$(CMD),python -m kvmd.apps.kvmd -m) \
 		"
@@ -169,6 +172,7 @@ run-ipmi: testenv
 			&& cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \
 			&& cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \
 			&& cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \
+			&& mkdir -p /etc/kvmd/override.d \
 			&& cp /testenv/$(if $(P),$(P),$(DEFAULT_PLATFORM)).override.yaml /etc/kvmd/override.yaml \
 			&& $(if $(CMD),$(CMD),python -m kvmd.apps.ipmi --run) \
 		"
@@ -189,6 +193,7 @@ run-vnc: testenv
 			&& cp /usr/share/kvmd/configs.default/kvmd/*.yaml /etc/kvmd \
 			&& cp /usr/share/kvmd/configs.default/kvmd/*passwd /etc/kvmd \
 			&& cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \
+			&& mkdir -p /etc/kvmd/override.d \
 			&& cp /testenv/$(if $(P),$(P),$(DEFAULT_PLATFORM)).override.yaml /etc/kvmd/override.yaml \
 			&& $(if $(CMD),$(CMD),python -m kvmd.apps.vnc --run) \
 		"
diff --git a/PKGBUILD b/PKGBUILD
index d121e09a..e2cb4d13 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -152,6 +152,7 @@ package_kvmd() {
 	install -Dm644 -t "$pkgdir/etc/kvmd" "$_cfg_default/kvmd"/*.yaml
 	install -Dm600 -t "$pkgdir/etc/kvmd" "$_cfg_default/kvmd"/*passwd
 	install -Dm644 -t "$pkgdir/etc/kvmd" "$_cfg_default/kvmd"/web.css
+	mkdir -p "$pkgdir/etc/kvmd/override.d"
 
 	mkdir -p "$pkgdir/var/lib/kvmd/msd"
 
diff --git a/configs/kvmd/main/v0-hdmi-rpi.yaml b/configs/kvmd/main/v0-hdmi-rpi.yaml
index a005e824..267e40c8 100644
--- a/configs/kvmd/main/v0-hdmi-rpi.yaml
+++ b/configs/kvmd/main/v0-hdmi-rpi.yaml
@@ -2,7 +2,7 @@
 # Use override.yaml to modify required settings.
 # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
 
-override: !include override.yaml
+override: !include [override.d, override.yaml]
 
 logging: !include logging.yaml
 
diff --git a/configs/kvmd/main/v0-hdmi-rpi2.yaml b/configs/kvmd/main/v0-hdmi-rpi2.yaml
index 4f208ac7..71a51e53 100644
--- a/configs/kvmd/main/v0-hdmi-rpi2.yaml
+++ b/configs/kvmd/main/v0-hdmi-rpi2.yaml
@@ -2,7 +2,7 @@
 # Use override.yaml to modify required settings.
 # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
 
-override: !include override.yaml
+override: !include [override.d, override.yaml]
 
 logging: !include logging.yaml
 
diff --git a/configs/kvmd/main/v0-hdmi-rpi3.yaml b/configs/kvmd/main/v0-hdmi-rpi3.yaml
index 1fdc9528..3018ad3d 100644
--- a/configs/kvmd/main/v0-hdmi-rpi3.yaml
+++ b/configs/kvmd/main/v0-hdmi-rpi3.yaml
@@ -2,7 +2,7 @@
 # Use override.yaml to modify required settings.
 # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
 
-override: !include override.yaml
+override: !include [override.d, override.yaml]
 
 logging: !include logging.yaml
 
diff --git a/configs/kvmd/main/v0-hdmi-zerow.yaml b/configs/kvmd/main/v0-hdmi-zerow.yaml
index eb589caa..43e565b8 100644
--- a/configs/kvmd/main/v0-hdmi-zerow.yaml
+++ b/configs/kvmd/main/v0-hdmi-zerow.yaml
@@ -2,7 +2,7 @@
 # Use override.yaml to modify required settings.
 # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
 
-override: !include override.yaml
+override: !include [override.d, override.yaml]
 
 logging: !include logging.yaml
 
diff --git a/configs/kvmd/main/v0-hdmiusb-rpi.yaml b/configs/kvmd/main/v0-hdmiusb-rpi.yaml
index 7873e165..0f037cb7 100644
--- a/configs/kvmd/main/v0-hdmiusb-rpi.yaml
+++ b/configs/kvmd/main/v0-hdmiusb-rpi.yaml
@@ -2,7 +2,7 @@
 # Use override.yaml to modify required settings.
 # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
 
-override: !include override.yaml
+override: !include [override.d, override.yaml]
 
 logging: !include logging.yaml
 
diff --git a/configs/kvmd/main/v0-hdmiusb-rpi2.yaml b/configs/kvmd/main/v0-hdmiusb-rpi2.yaml
index 7873e165..0f037cb7 100644
--- a/configs/kvmd/main/v0-hdmiusb-rpi2.yaml
+++ b/configs/kvmd/main/v0-hdmiusb-rpi2.yaml
@@ -2,7 +2,7 @@
 # Use override.yaml to modify required settings.
 # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
 
-override: !include override.yaml
+override: !include [override.d, override.yaml]
 
 logging: !include logging.yaml
 
diff --git a/configs/kvmd/main/v0-hdmiusb-rpi3.yaml b/configs/kvmd/main/v0-hdmiusb-rpi3.yaml
index d759db4d..3182efb7 100644
--- a/configs/kvmd/main/v0-hdmiusb-rpi3.yaml
+++ b/configs/kvmd/main/v0-hdmiusb-rpi3.yaml
@@ -2,7 +2,7 @@
 # Use override.yaml to modify required settings.
 # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
 
-override: !include override.yaml
+override: !include [override.d, override.yaml]
 
 logging: !include logging.yaml
 
diff --git a/configs/kvmd/main/v0-hdmiusb-zerow.yaml b/configs/kvmd/main/v0-hdmiusb-zerow.yaml
index 7873e165..0f037cb7 100644
--- a/configs/kvmd/main/v0-hdmiusb-zerow.yaml
+++ b/configs/kvmd/main/v0-hdmiusb-zerow.yaml
@@ -2,7 +2,7 @@
 # Use override.yaml to modify required settings.
 # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
 
-override: !include override.yaml
+override: !include [override.d, override.yaml]
 
 logging: !include logging.yaml
 
diff --git a/configs/kvmd/main/v2-hdmi-rpi3.yaml b/configs/kvmd/main/v2-hdmi-rpi3.yaml
index 367d3219..2b3e4f29 100644
--- a/configs/kvmd/main/v2-hdmi-rpi3.yaml
+++ b/configs/kvmd/main/v2-hdmi-rpi3.yaml
@@ -2,7 +2,7 @@
 # Use override.yaml to modify required settings.
 # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
 
-override: !include override.yaml
+override: !include [override.d, override.yaml]
 
 logging: !include logging.yaml
 
diff --git a/configs/kvmd/main/v2-hdmi-rpi4.yaml b/configs/kvmd/main/v2-hdmi-rpi4.yaml
index 8bc0eb20..1ab8dda9 100644
--- a/configs/kvmd/main/v2-hdmi-rpi4.yaml
+++ b/configs/kvmd/main/v2-hdmi-rpi4.yaml
@@ -2,7 +2,7 @@
 # Use override.yaml to modify required settings.
 # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
 
-override: !include override.yaml
+override: !include [override.d, override.yaml]
 
 logging: !include logging.yaml
 
diff --git a/configs/kvmd/main/v2-hdmi-zerow.yaml b/configs/kvmd/main/v2-hdmi-zerow.yaml
index cf0fa6f4..7fab7c74 100644
--- a/configs/kvmd/main/v2-hdmi-zerow.yaml
+++ b/configs/kvmd/main/v2-hdmi-zerow.yaml
@@ -2,7 +2,7 @@
 # Use override.yaml to modify required settings.
 # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
 
-override: !include override.yaml
+override: !include [override.d, override.yaml]
 
 logging: !include logging.yaml
 
diff --git a/configs/kvmd/main/v2-hdmiusb-generic.yaml b/configs/kvmd/main/v2-hdmiusb-generic.yaml
index c79f8f35..8a397aee 100644
--- a/configs/kvmd/main/v2-hdmiusb-generic.yaml
+++ b/configs/kvmd/main/v2-hdmiusb-generic.yaml
@@ -2,7 +2,7 @@
 # Use override.yaml to modify required settings.
 # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
 
-override: !include override.yaml
+override: !include [override.d, override.yaml]
 
 logging: !include logging.yaml
 
diff --git a/configs/kvmd/main/v2-hdmiusb-rpi4.yaml b/configs/kvmd/main/v2-hdmiusb-rpi4.yaml
index 1e1123fc..cb0bbe0a 100644
--- a/configs/kvmd/main/v2-hdmiusb-rpi4.yaml
+++ b/configs/kvmd/main/v2-hdmiusb-rpi4.yaml
@@ -2,7 +2,7 @@
 # Use override.yaml to modify required settings.
 # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
 
-override: !include override.yaml
+override: !include [override.d, override.yaml]
 
 logging: !include logging.yaml
 
diff --git a/configs/kvmd/main/v3-hdmi-rpi4.yaml b/configs/kvmd/main/v3-hdmi-rpi4.yaml
index c4f5a4af..6d113d7c 100644
--- a/configs/kvmd/main/v3-hdmi-rpi4.yaml
+++ b/configs/kvmd/main/v3-hdmi-rpi4.yaml
@@ -2,7 +2,7 @@
 # Use override.yaml to modify required settings.
 # You can find a working configuration in /usr/share/kvmd/configs.default/kvmd.
 
-override: !include override.yaml
+override: !include [override.d, override.yaml]
 
 logging: !include logging.yaml