diff options
| author | Devaev Maxim <[email protected]> | 2018-11-13 06:26:47 +0300 |
|---|---|---|
| committer | Devaev Maxim <[email protected]> | 2018-11-13 06:26:47 +0300 |
| commit | 5fb74a9241440aed8b660d139abda9c34c57a8e9 (patch) | |
| tree | 8cfc87b4aaf2086553ca172d036b83ca7b1bee32 | |
| parent | 44c9515be4e44e2af658b4f2a000d5a87569eac1 (diff) | |
.yaml again
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | PKGBUILD | 3 | ||||
| -rw-r--r-- | configs/kvmd/v1-hdmi.yaml (renamed from configs/kvmd/v1-hdmi.conf) | 0 | ||||
| -rw-r--r-- | configs/kvmd/v1-vga.yaml (renamed from configs/kvmd/v1-vga.conf) | 0 | ||||
| -rw-r--r-- | configs/systemd/kvmd.service | 4 | ||||
| -rw-r--r-- | testenv/kvmd.yaml (renamed from testenv/kvmd.conf) | 0 |
6 files changed, 5 insertions, 4 deletions
@@ -10,7 +10,7 @@ TESTENV_CMD ?= /bin/bash -c " \ && ln -s $(TESTENV_VIDEO) /dev/kvmd-streamer \ && (losetup -d /dev/kvmd-msd || true) \ && losetup /dev/kvmd-msd /root/loop.img \ - && python -m kvmd.apps.kvmd -c testenv/kvmd.conf \ + && python -m kvmd.apps.kvmd -c testenv/kvmd.yaml \ " @@ -38,7 +38,8 @@ package() { python setup.py install --root="$pkgdir" install -Dm644 configs/systemd/kvmd.service "$pkgdir/usr/lib/systemd/system/kvmd.service" install -Dm644 configs/systemd/kvmd-tc358743.service "$pkgdir/usr/lib/systemd/system/kvmd-tc358743.service" - mkdir -p "$pkgdir/usr/share/kvmd" "$pkgdir/etc/kvmd" + mkdir -p "$pkgdir/usr/share/kvmd" + mkdir -p "$pkgdir/etc/kvmd" cp -r web "$pkgdir/usr/share/kvmd" cp -r configs "$pkgdir/usr/share/kvmd" find "$pkgdir" -name ".gitignore" -delete diff --git a/configs/kvmd/v1-hdmi.conf b/configs/kvmd/v1-hdmi.yaml index 0e199ac6..0e199ac6 100644 --- a/configs/kvmd/v1-hdmi.conf +++ b/configs/kvmd/v1-hdmi.yaml diff --git a/configs/kvmd/v1-vga.conf b/configs/kvmd/v1-vga.yaml index c4cd2778..c4cd2778 100644 --- a/configs/kvmd/v1-vga.conf +++ b/configs/kvmd/v1-vga.yaml diff --git a/configs/systemd/kvmd.service b/configs/systemd/kvmd.service index 765508fe..ee5f2d68 100644 --- a/configs/systemd/kvmd.service +++ b/configs/systemd/kvmd.service @@ -7,8 +7,8 @@ Type=simple Restart=always RestartSec=3 -ExecStart=/usr/bin/kvmd --config /etc/kvmd/kvmd.conf -ExecStopPost=/usr/bin/kvmd-cleanup --config /etc/kvmd/kvmd.conf +ExecStart=/usr/bin/kvmd --config /etc/kvmd/kvmd.yaml +ExecStopPost=/usr/bin/kvmd-cleanup --config /etc/kvmd/kvmd.yaml [Install] WantedBy=multi-user.target diff --git a/testenv/kvmd.conf b/testenv/kvmd.yaml index 78c06498..78c06498 100644 --- a/testenv/kvmd.conf +++ b/testenv/kvmd.yaml |