diff --git a/Makefile b/Makefile index 81191e1b..80e1eaaa 100644 --- a/Makefile +++ b/Makefile @@ -331,7 +331,7 @@ run-nogpio: 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/*.secret /etc/kvmd \ - && cp /usr/share/kvmd/configs.default/kvmd/main/$(if $(P),$(P),$(DEFAULT_PLATFORM)).yaml /etc/kvmd/main.yaml \ + && cp /usr/share/kvmd/configs.default/kvmd/main.yaml /etc/kvmd/main.yaml \ && ln -s /testenv/web.css /etc/kvmd/web.css \ && mkdir -p /etc/kvmd/override.d \ && cp /testenv/$(if $(P),$(P),$(DEFAULT_PLATFORM)).override.yaml /etc/kvmd/override.yaml \ diff --git a/testenv/v2-hdmiusb-rpi4.override.yaml b/testenv/v2-hdmiusb-rpi4.override.yaml index d46597bd..fe75b420 100644 --- a/testenv/v2-hdmiusb-rpi4.override.yaml +++ b/testenv/v2-hdmiusb-rpi4.override.yaml @@ -18,7 +18,7 @@ kvmd: streamer: cmd: - "/usr/bin/ustreamer" - - "--device=/dev/kvmd-video" + - "--device=/dev/video0" - "--persistent" - "--format=mjpeg" - "--resolution={resolution}" diff --git a/web/kvm/index.html b/web/kvm/index.html index 597671ad..a5722260 100644 --- a/web/kvm/index.html +++ b/web/kvm/index.html @@ -259,6 +259,11 @@ +