summarylogtreecommitdiffstats
path: root/systemd-unit-conflicts.diff
blob: e924112a859df8f1a408f7f61375a8654f3633c6 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
From 6d176a8dfae453e43cda8e79312f01533dbc18d7 Mon Sep 17 00:00:00 2001
From: Frederik Schwan <frederik@tty42.de>
Date: Wed, 2 Apr 2025 22:22:10 +0200
Subject: [PATCH 2/2] add conflicts with 64 bit service

---
 etc/pcscd.service.in | 1 +
 etc/pcscd.socket.in  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/etc/pcscd.service.in b/etc/pcscd.service.in
index 86b3ec9e..60732c17 100644
--- a/etc/pcscd.service.in
+++ b/etc/pcscd.service.in
@@ -2,6 +2,7 @@
 Description=PC/SC Smart Card Daemon
 Requires=pcscd@program_suffix@.socket
 @requires_polkit@
+Conflicts=pcscd.service
 Documentation=man:pcscd(8)
 
 [Service]
diff --git a/etc/pcscd.socket.in b/etc/pcscd.socket.in
index 81c855ce..a44e228c 100644
--- a/etc/pcscd.socket.in
+++ b/etc/pcscd.socket.in
@@ -1,5 +1,6 @@
 [Unit]
 Description=PC/SC Smart Card Daemon Activation Socket
+Conflicts=pcscd.socket
 
 [Socket]
 ListenStream=@ipcdir@/pcscd.comm
-- 
2.51.0