diff options
| author |  Christian Hesse <mail@eworm.de> | 2016-02-26 21:59:34 +0100 |
|---|---|---|
| committer | Christian Hesse <mail@eworm.de> | 2016-04-04 14:42:44 +0200 |
| commit | 0b8dd2579e2446dc04d6818297fa7b1600b54b30 (patch) | |
| tree | d45a340150f5d0521c2fcafefaa5dafd344c9cdf | |
| parent | e1ee22c9bb2d8c754fcfb93d9559f59bee73fd10 (diff) | |
| download | mkinitcpio-ykfde-0b8dd2579e2446dc04d6818297fa7b1600b54b30.tar.gz mkinitcpio-ykfde-0b8dd2579e2446dc04d6818297fa7b1600b54b30.tar.zst | |
let systemd-ask-password add the key to store and drop keyctlsystemd-v227
Signed-off-by: Christian Hesse <mail@eworm.de>
| -rw-r--r-- | mkinitcpio/ykfde | 1 | ||||
| -rw-r--r-- | systemd/ykfde-2f | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/mkinitcpio/ykfde b/mkinitcpio/ykfde index 2051730..5a407f5 100644 --- a/mkinitcpio/ykfde +++ b/mkinitcpio/ykfde @@ -12,7 +12,6 @@ build() { add_systemd_unit ykfde-2f.service add_symlink /usr/lib/systemd/system/sysinit.target.wants/ykfde-2f.service ../ykfde-2f.service add_file /usr/lib/systemd/scripts/ykfde-2f - add_binary keyctl add_binary systemd-ask-password # shell and commands diff --git a/systemd/ykfde-2f b/systemd/ykfde-2f index 3aac298..0884a61 100644 --- a/systemd/ykfde-2f +++ b/systemd/ykfde-2f @@ -5,9 +5,7 @@ # This software may be used and distributed according to the terms # of the GNU General Public License, incorporated herein by reference. -YKFDEFACTOR="$(systemd-ask-password --no-tty 'Please enter second factor for Yubikey full disk encryption!')" -YKFDESERIAL="$(keyctl 'add' 'user' 'ykfde-2f' "${YKFDEFACTOR}" '@u')" -keyctl 'timeout' "${YKFDESERIAL}" '150' +systemd-ask-password --no-tty --keyname='ykfde-2f' 'Please enter second factor for Yubikey full disk encryption!' if [ -s '/run/ykfde.pid' ]; then kill -USR1 $(cat '/run/ykfde.pid') |