Browse Source

Added supported-service keyboard-layout to allow for better working Qube Manager

references QubesOS/qubes-issues#6030
Marta Marczykowska-Górecka 3 years ago
parent
commit
7fa468eb0c
4 changed files with 10 additions and 1 deletions
  1. 3 0
      Makefile
  2. 3 0
      debian/rules
  3. 1 1
      rpm_spec/qubes-core-admin-client.spec.in
  4. 3 0
      scripts/30-keyboard-layout-service.sh

+ 3 - 0
Makefile

@@ -16,6 +16,9 @@ install:
 	install -d $(DESTDIR)/usr/bin
 	ln -sf qvm-start-daemon $(DESTDIR)/usr/bin/qvm-start-gui
 	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:
 	rm -rf test-packages/__pycache__ qubesadmin/__pycache__

+ 3 - 0
debian/rules

@@ -25,6 +25,9 @@ override_dh_auto_install:
 	install -d debian/qubes-core-admin-client/usr/share/man/man1
 	install -m 0644 build/man/* \
 		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:
 	dh_clean -O--buildsystem=pybuild

+ 1 - 1
rpm_spec/qubes-core-admin-client.spec.in

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

+ 3 - 0
scripts/30-keyboard-layout-service.sh

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