diff options
| author | Devaev Maxim <[email protected]> | 2018-10-31 11:00:25 +0300 |
|---|---|---|
| committer | Devaev Maxim <[email protected]> | 2018-10-31 11:00:25 +0300 |
| commit | e0cab7db58baf856736893d084e0d2a1cf0c9a3f (patch) | |
| tree | d69377fba818eea5c693af6cc4b3dbf56760b500 | |
| parent | 1a06e8d1eb4f9afa72fd4d1ca506724c7a8c54c0 (diff) | |
configs moving
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | configs/kvmd/tc358743-edid.hex (renamed from configs/tc358743/edid.hex) | 0 | ||||
| -rw-r--r-- | configs/kvmd/v1-hdmi.conf (renamed from configs/kvmd/v1-hdmi.yaml) | 2 | ||||
| -rw-r--r-- | configs/kvmd/v1-vga.conf (renamed from configs/kvmd/v1-vga.yaml) | 2 | ||||
| -rw-r--r-- | configs/systemd/kvmd-tc358743.service (renamed from configs/kvmd-tc358743.service) | 2 | ||||
| -rw-r--r-- | configs/systemd/kvmd.service (renamed from configs/kvmd.service) | 4 | ||||
| -rw-r--r-- | testenv/kvmd.conf (renamed from testenv/kvmd.yaml) | 2 |
8 files changed, 13 insertions, 7 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 -c testenv/kvmd.yaml \ + && python -m kvmd -c testenv/kvmd.conf \ " @@ -36,9 +36,9 @@ build() { package() { cd $srcdir/$pkgname-build python setup.py install --root="$pkgdir" - install -Dm644 configs/kvmd.service "$pkgdir/usr/lib/systemd/system/kvmd.service" - install -Dm644 configs/kvmd-tc358743.service "$pkgdir/usr/lib/systemd/system/kvmd-tc358743.service" - mkdir -p "$pkgdir/usr/share/kvmd" + 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" cp -r web "$pkgdir/usr/share/kvmd" cp -r configs "$pkgdir/usr/share/kvmd" } diff --git a/configs/tc358743/edid.hex b/configs/kvmd/tc358743-edid.hex index c92292f1..c92292f1 100644 --- a/configs/tc358743/edid.hex +++ b/configs/kvmd/tc358743-edid.hex diff --git a/configs/kvmd/v1-hdmi.yaml b/configs/kvmd/v1-hdmi.conf index abb73101..5d184764 100644 --- a/configs/kvmd/v1-hdmi.yaml +++ b/configs/kvmd/v1-hdmi.conf @@ -85,3 +85,5 @@ logging: level: INFO handlers: - console + +# vim: syntax=yaml diff --git a/configs/kvmd/v1-vga.yaml b/configs/kvmd/v1-vga.conf index 055c8363..221852e0 100644 --- a/configs/kvmd/v1-vga.yaml +++ b/configs/kvmd/v1-vga.conf @@ -87,3 +87,5 @@ logging: level: INFO handlers: - console + +# vim: syntax=yaml diff --git a/configs/kvmd-tc358743.service b/configs/systemd/kvmd-tc358743.service index e23e715f..d1b89862 100644 --- a/configs/kvmd-tc358743.service +++ b/configs/systemd/kvmd-tc358743.service @@ -5,7 +5,7 @@ Before=kvmd.service [Service] Type=oneshot -ExecStart=/usr/bin/v4l2-ctl --device=/dev/kvmd-streamer --set-edid=file=/usr/share/kvmd/configs/tc358743/edid.hex --fix-edid-checksums +ExecStart=/usr/bin/v4l2-ctl --device=/dev/kvmd-streamer --set-edid=file=/etc/kvmd/tc358743-edid.hex --fix-edid-checksums ExecStop=/bin/true RemainAfterExit=true diff --git a/configs/kvmd.service b/configs/systemd/kvmd.service index 185a4eb5..765508fe 100644 --- a/configs/kvmd.service +++ b/configs/systemd/kvmd.service @@ -7,8 +7,8 @@ Type=simple Restart=always RestartSec=3 -ExecStart=/usr/bin/kvmd --config /etc/kvmd.yaml -ExecStopPost=/usr/bin/kvmd-cleanup --config /etc/kvmd.yaml +ExecStart=/usr/bin/kvmd --config /etc/kvmd/kvmd.conf +ExecStopPost=/usr/bin/kvmd-cleanup --config /etc/kvmd/kvmd.conf [Install] WantedBy=multi-user.target diff --git a/testenv/kvmd.yaml b/testenv/kvmd.conf index 93ab087b..d95871c3 100644 --- a/testenv/kvmd.yaml +++ b/testenv/kvmd.conf @@ -82,3 +82,5 @@ logging: level: INFO handlers: - console + +# vim: syntax=yaml |