Qubes/core-admin-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/161'

Browse Source 
* origin/pr/161:
  Added supported-service keyboard-layout to allow for better working Qube Manager
This commit is contained in:
Marek Marczykowski-Górecki 2020-09-30 02:09:35 +02:00
commit 4fa5154f48
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
4 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -16,6 +16,9 @@ install:
install -d $(DESTDIR)/usr/bin install -d $(DESTDIR)/usr/bin
ln -sf qvm-start-daemon $(DESTDIR)/usr/bin/qvm-start-gui ln -sf qvm-start-daemon $(DESTDIR)/usr/bin/qvm-start-gui
install -m 0755 scripts/qubes-guivm-session $(DESTDIR)/usr/bin/ install -m 0755 scripts/qubes-guivm-session $(DESTDIR)/usr/bin/
install -d $(DESTDIR)/etc/qubes/post-install.d
install -m 0755 scripts/30-keyboard-layout-service.sh \
$(DESTDIR)/etc/qubes/post-install.d/30-keyboard-layout-service.sh
clean: clean:
rm -rf test-packages/__pycache__ qubesadmin/__pycache__ rm -rf test-packages/__pycache__ qubesadmin/__pycache__

3
debian/rules vendored
View File

@ -25,6 +25,9 @@ override_dh_auto_install:
install -d debian/qubes-core-admin-client/usr/share/man/man1 install -d debian/qubes-core-admin-client/usr/share/man/man1
install -m 0644 build/man/* \ install -m 0644 build/man/* \
debian/qubes-core-admin-client/usr/share/man/man1/ debian/qubes-core-admin-client/usr/share/man/man1/
install -d debian/qubes-core-admin-client/etc/qubes/post-install.d
install -m 0755 scripts/30-keyboard-layout-service.sh \
debian/qubes-core-admin-client/etc/qubes/post-install.d/30-keyboard-layout-service.sh
override_dh_clean: override_dh_clean:
dh_clean -O--buildsystem=pybuild dh_clean -O--buildsystem=pybuild

2
rpm_spec/qubes-core-admin-client.spec.in
View File

@ -67,7 +67,7 @@ make -C doc DESTDIR=$RPM_BUILD_ROOT \
%files -n python%{python3_pkgversion}-qubesadmin %files -n python%{python3_pkgversion}-qubesadmin
%{python3_sitelib}/qubesadmin-*egg-info %{python3_sitelib}/qubesadmin-*egg-info
%{python3_sitelib}/qubesadmin %{python3_sitelib}/qubesadmin
/etc/qubes/post-install.d/30-keyboard-layout-service.sh
%changelog %changelog
@CHANGELOG@ @CHANGELOG@

3
scripts/30-keyboard-layout-service.sh Normal file
View File

@ -0,0 +1,3 @@
#!/bin/sh
qvm-features-request supported-feature.keyboard-layout=1