summaryrefslogtreecommitdiffstats
path: root/systemd
diff options
context:
space:
mode:
authorGravatar Christian Hesse <mail@eworm.de>2017-06-20 18:23:52 +0200
committerGravatar Christian Hesse <mail@eworm.de>2017-06-20 18:23:52 +0200
commit462068f247b0073aeb7b1866529e3cbba299e612 (patch)
tree3068fadcffe60d28912e7c2a2f7876f9b73e1d8d /systemd
parentd0d025a737c3b8fa2a07580a138b90e408121e27 (diff)
downloadmkinitcpio-ykfde-462068f247b0073aeb7b1866529e3cbba299e612.tar.gz
mkinitcpio-ykfde-462068f247b0073aeb7b1866529e3cbba299e612.tar.zst
Rework the code, update keyring handlingsystemd-v233
This had some historical issue... So rework the code: * split into more functions * drop the sleep and notify logic * update keyring handling Depending on setup and systemd version (233 and up) the keyring handling fails. Try to fix this by... * writing to session keyring first * setting permissions * linking to user keyring * unlinking from session keyring https://mjg59.dreamwidth.org/37333.html
Diffstat (limited to 'systemd')
-rw-r--r--systemd/ykfde-worker.service (renamed from systemd/ykfde-notify.service)10
1 files changed, 2 insertions, 8 deletions
diff --git a/systemd/ykfde-notify.service b/systemd/ykfde-worker.service
index c3a8d21..6f5a18f 100644
--- a/systemd/ykfde-notify.service
+++ b/systemd/ykfde-worker.service
@@ -4,19 +4,13 @@
# of the GNU General Public License, incorporated herein by reference.
[Unit]
-Description=Notify ykfde about key
+Description=Run ykfde worker
DefaultDependencies=no
Before=cryptsetup-pre.target
Wants=cryptsetup-pre.target
Requires=ykfde-2f.service
After=ykfde-2f.service
-ConditionPathExists=/run/ykfde.pid
[Service]
Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/pkill -USR1 --pidfile /run/ykfde.pid
-# ykfde started from udev needs a moment to set up the key
-# in store. It is out of systemd control, so wait a moment
-# here.
-ExecStart=/usr/bin/sleep 0.2
+ExecStart=/usr/lib/udev/ykfde