summaryrefslogtreecommitdiffstats
path: root/dracut
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 /dracut
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 'dracut')
-rwxr-xr-xdracut/module-setup.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/dracut/module-setup.sh b/dracut/module-setup.sh
index d7fdb3f..3cab1c8 100755
--- a/dracut/module-setup.sh
+++ b/dracut/module-setup.sh
@@ -22,8 +22,8 @@ install() {
inst_simple /usr/lib/systemd/system/cryptsetup-pre.target
inst_simple /usr/lib/systemd/system/ykfde-2f.service
ln_r $systemdsystemunitdir/ykfde-2f.service $systemdsystemunitdir/sysinit.target.wants/ykfde-2f.service
- inst_simple /usr/lib/systemd/system/ykfde-notify.service
- ln_r $systemdsystemunitdir/ykfde-notify.service $systemdsystemunitdir/sysinit.target.wants/ykfde-notify.service
+ inst_simple /usr/lib/systemd/system/ykfde-worker.service
+ ln_r $systemdsystemunitdir/ykfde-worker.service $systemdsystemunitdir/sysinit.target.wants/ykfde-worker.service
inst_simple /usr/bin/systemd-ask-password
inst_simple /usr/bin/pkill
inst_simple /usr/bin/sleep