From 462068f247b0073aeb7b1866529e3cbba299e612 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Tue, 20 Jun 2017 18:23:52 +0200 Subject: Rework the code, update keyring handling 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 --- dracut/module-setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dracut') 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 -- cgit v1.2.3-70-g09d2