From 5fb74a9241440aed8b660d139abda9c34c57a8e9 Mon Sep 17 00:00:00 2001
From: Devaev Maxim <mdevaev@gmail.com>
Date: Tue, 13 Nov 2018 06:26:47 +0300
Subject: [PATCH] .yaml again

---
 Makefile                                    | 2 +-
 PKGBUILD                                    | 3 ++-
 configs/kvmd/{v1-hdmi.conf => v1-hdmi.yaml} | 0
 configs/kvmd/{v1-vga.conf => v1-vga.yaml}   | 0
 configs/systemd/kvmd.service                | 4 ++--
 testenv/{kvmd.conf => kvmd.yaml}            | 0
 6 files changed, 5 insertions(+), 4 deletions(-)
 rename configs/kvmd/{v1-hdmi.conf => v1-hdmi.yaml} (100%)
 rename configs/kvmd/{v1-vga.conf => v1-vga.yaml} (100%)
 rename testenv/{kvmd.conf => kvmd.yaml} (100%)

diff --git a/Makefile b/Makefile
index 074ab7d6..c50c7b00 100644
--- a/Makefile
+++ b/Makefile
@@ -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 \
 	"
 
 
diff --git a/PKGBUILD b/PKGBUILD
index 9cbe951c..2f59c6ef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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
similarity index 100%
rename from configs/kvmd/v1-hdmi.conf
rename to configs/kvmd/v1-hdmi.yaml
diff --git a/configs/kvmd/v1-vga.conf b/configs/kvmd/v1-vga.yaml
similarity index 100%
rename from configs/kvmd/v1-vga.conf
rename to 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
similarity index 100%
rename from testenv/kvmd.conf
rename to testenv/kvmd.yaml