From bde28cb8f3facfbdf15df4a97e35f959b698c69c Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Mon, 18 Jan 2016 14:30:56 +0100
Subject: remove ykfde-cpio hook and make cpio archive mandatory

---
 Makefile              |  1 -
 mkinitcpio/ykfde      |  5 -----
 mkinitcpio/ykfde-cpio | 15 ---------------
 3 files changed, 21 deletions(-)
 delete mode 100644 mkinitcpio/ykfde-cpio

diff --git a/Makefile b/Makefile
index 8f8e006..cc330fa 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,6 @@ install-doc: README.html README-mkinitcpio.html README-dracut.html
 
 install-mkinitcpio: install-bin install-doc
 	$(INSTALL) -D -m0644 mkinitcpio/ykfde $(DESTDIR)/usr/lib/initcpio/install/ykfde
-	$(INSTALL) -D -m0644 mkinitcpio/ykfde-cpio $(DESTDIR)/usr/lib/initcpio/install/ykfde-cpio
 	$(INSTALL) -D -m0644 mkinitcpio/ykfde-2f $(DESTDIR)/usr/lib/initcpio/install/ykfde-2f
 	$(INSTALL) -D -m0644 udev/20-ykfde.rules $(DESTDIR)/usr/lib/initcpio/udev/20-ykfde.rules
 
diff --git a/mkinitcpio/ykfde b/mkinitcpio/ykfde
index f4115d6..d811c09 100644
--- a/mkinitcpio/ykfde
+++ b/mkinitcpio/ykfde
@@ -1,15 +1,10 @@
 #!/bin/sh
 
 build() {
-	# This will update to LUKS key slot if Yubikey is available.
-	# Do not fail if key is not present!
-	/usr/bin/ykfde >/dev/null 2>/dev/null || true
-
 	# install 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
-	add_full_dir /etc/ykfde.d/
 }
 
 help() {
diff --git a/mkinitcpio/ykfde-cpio b/mkinitcpio/ykfde-cpio
deleted file mode 100644
index c055a6d..0000000
--- a/mkinitcpio/ykfde-cpio
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-build() {
-	# install 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
-}
-
-help() {
-	echo "This hook adds support for opening LUKS devices with Yubico key."
-	echo "Please use command 'ykfde' to prepare."
-	echo "The hook ykfde-cpio does NOT include challenges! Please load"
-	echo "additional cpio archive with bootloader."
-}
-- 
cgit v1.2.3-54-g00ecf