Fix qvm-service names

'@' is not allowed character in qvm-service, use '-' instead.
Plus, make the default service react to the plain 'dummy-psu' name, as
set by the salt formula.

Author: marmarek

Makefile

@@ -47,4 +47,5 @@ install:
 	install -m 755 receiver/20-dummy-psu.sh $(DESTDIR)/etc/qubes/post-install.d
 	install -m 755 receiver/qubes-psu-client $(DESTDIR)/usr/bin
 	install -m 644 receiver/qubes-psu-client@.service receiver/module-load-dummy-psu.service $(DESTDIR)/usr/lib/systemd/system
+	install -D -m 644 receiver/qubes-psu-client@default.service-default.conf \
 		$(DESTDIR)/usr/lib/systemd/system/qubes-psu-client@default.service.d/30-default.conf

dummy-psu.spec.in

@@ -74,6 +74,7 @@ make client
 /etc/qubes/post-install.d/20-dummy-psu.sh
 /usr/bin/qubes-psu-client
 /usr/lib/systemd/system/qubes-psu-client@.service
+/usr/lib/systemd/system/qubes-psu-client@default.service.d/30-default.conf
 /usr/lib/systemd/system/module-load-dummy-psu.service
 
 

receiver/module-load-dummy-psu.service

@@ -1,6 +1,6 @@
 [Unit]
 Description=Dummy psu module loader service
-ConditionPathExistsGlob=/var/run/qubes-service/dummy-psu@*
+ConditionPathExistsGlob=/var/run/qubes-service/dummy-psu*
 
 [Service]
 Type=oneshot
@@ -9,4 +9,4 @@ ExecStart=/sbin/modprobe dummy-psu
 ExecStop=/sbin/rmmod dummy-psu
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

receiver/qubes-psu-client@.service

@@ -1,10 +1,10 @@
 [Unit]
 Description=Dummy power supply client service
-ConditionPathExists=/var/run/qubes-service/dummy-psu@%i
+ConditionPathExists=/var/run/qubes-service/dummy-psu-%i
 After=qubes-qrexec-agent.service module-load-dummy-psu.service
 
 [Service]
 ExecStart=/usr/bin/qubes-psu-client %i
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

receiver/qubes-psu-client@default.service-default.conf

@@ -0,0 +1,5 @@
+[Unit]
+# replace /var/run/qubes-service/dummy-psu-default with just
+# /var/run/qubes-service/dummy-psu
+ConditionPathExists=
+ConditionPathExists=/var/run/qubes-service/dummy-psu