GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-12 09:10:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

configs moving

Browse Source
This commit is contained in:
Devaev Maxim 2018-10-31 11:00:25 +03:00
parent 1a06e8d1eb
commit e0cab7db58
8 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -10,7 +10,7 @@ TESTENV_CMD ?= /bin/bash -c " \
&& ln -s $(TESTENV_VIDEO) /dev/kvmd-streamer \ && ln -s $(TESTENV_VIDEO) /dev/kvmd-streamer \
&& (losetup -d /dev/kvmd-msd || true) \ && (losetup -d /dev/kvmd-msd || true) \
&& losetup /dev/kvmd-msd /root/loop.img \ && losetup /dev/kvmd-msd /root/loop.img \
&& python -m kvmd -c testenv/kvmd.yaml \ && python -m kvmd -c testenv/kvmd.conf \
" "

6
PKGBUILD
View File

@ -36,9 +36,9 @@ build() {
package() { package() {
cd $srcdir/$pkgname-build cd $srcdir/$pkgname-build
python setup.py install --root="$pkgdir" python setup.py install --root="$pkgdir"
install -Dm644 configs/kvmd.service "$pkgdir/usr/lib/systemd/system/kvmd.service" install -Dm644 configs/systemd/kvmd.service "$pkgdir/usr/lib/systemd/system/kvmd.service"
install -Dm644 configs/kvmd-tc358743.service "$pkgdir/usr/lib/systemd/system/kvmd-tc358743.service" install -Dm644 configs/systemd/kvmd-tc358743.service "$pkgdir/usr/lib/systemd/system/kvmd-tc358743.service"
mkdir -p "$pkgdir/usr/share/kvmd" mkdir -p "$pkgdir/usr/share/kvmd" "$pkgdir/etc/kvmd"
cp -r web "$pkgdir/usr/share/kvmd" cp -r web "$pkgdir/usr/share/kvmd"
cp -r configs "$pkgdir/usr/share/kvmd" cp -r configs "$pkgdir/usr/share/kvmd"
} }

0
configs/tc358743/edid.hex → configs/kvmd/tc358743-edid.hex
View File

2
configs/kvmd/v1-hdmi.yaml → configs/kvmd/v1-hdmi.conf
View File

@ -85,3 +85,5 @@ logging:
level: INFO level: INFO
handlers: handlers:
- console - console
# vim: syntax=yaml

2
configs/kvmd/v1-vga.yaml → configs/kvmd/v1-vga.conf
View File

@ -87,3 +87,5 @@ logging:
level: INFO level: INFO
handlers: handlers:
- console - console
# vim: syntax=yaml

2
configs/kvmd-tc358743.service → configs/systemd/kvmd-tc358743.service
View File

@ -5,7 +5,7 @@ Before=kvmd.service
[Service] [Service]
Type=oneshot 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 ExecStop=/bin/true
RemainAfterExit=true RemainAfterExit=true

4
configs/kvmd.service → configs/systemd/kvmd.service
View File

@ -7,8 +7,8 @@ Type=simple
Restart=always Restart=always
RestartSec=3 RestartSec=3
ExecStart=/usr/bin/kvmd --config /etc/kvmd.yaml ExecStart=/usr/bin/kvmd --config /etc/kvmd/kvmd.conf
ExecStopPost=/usr/bin/kvmd-cleanup --config /etc/kvmd.yaml ExecStopPost=/usr/bin/kvmd-cleanup --config /etc/kvmd/kvmd.conf
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

2
testenv/kvmd.yaml → testenv/kvmd.conf
View File

@ -82,3 +82,5 @@ logging:
level: INFO level: INFO
handlers: handlers:
- console - console
# vim: syntax=yaml