diff options
| author |  Christian Hesse <mail@eworm.de> | 2016-01-18 21:07:33 +0100 |
|---|---|---|
| committer | Christian Hesse <mail@eworm.de> | 2016-01-18 21:08:48 +0100 |
| commit | 7a91821f13b63e3efd0822fcf3c7bc47592cd730 (patch) | |
| tree | b59a9ab92733537ee04180b271a86d07f6929907 /mkinitcpio | |
| parent | c4ee1484c464008e720ba40ba26ec69ca52d68a7 (diff) | |
| download | mkinitcpio-ykfde-7a91821f13b63e3efd0822fcf3c7bc47592cd730.tar.gz mkinitcpio-ykfde-7a91821f13b63e3efd0822fcf3c7bc47592cd730.tar.zst | |
merge mkinitcpio hooks
Diffstat (limited to 'mkinitcpio')
| -rw-r--r-- | mkinitcpio/ykfde | 14 | ||||
| -rw-r--r-- | mkinitcpio/ykfde-2f | 14 |
2 files changed, 12 insertions, 16 deletions
diff --git a/mkinitcpio/ykfde b/mkinitcpio/ykfde index d811c09..3545def 100644 --- a/mkinitcpio/ykfde +++ b/mkinitcpio/ykfde @@ -1,13 +1,23 @@ #!/bin/sh build() { - # install files to initramfs + # install basic files to initramfs add_binary /usr/lib/udev/ykfde add_file /usr/lib/initcpio/udev/20-ykfde.rules /usr/lib/udev/rules.d/20-ykfde.rules add_file /etc/ykfde.conf + + # this is required for second factor + if egrep -qi 'second factor = (yes|true|1)' /etc/ykfde.conf; then + add_systemd_unit cryptsetup-pre.target + 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 + fi } help() { echo "This hook adds support for opening LUKS devices with Yubico key." - echo "Please use command 'ykfde' to prepare." + echo "Read the documentation for additional steps to set this up." } diff --git a/mkinitcpio/ykfde-2f b/mkinitcpio/ykfde-2f deleted file mode 100644 index 5e09dd9..0000000 --- a/mkinitcpio/ykfde-2f +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -build() { - add_systemd_unit cryptsetup-pre.target - 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 -} - -help() { - echo "This hook adds 2nd factor support for Yubikey full disk encryption." -} |