Add keyfile support

arch-luks-suspend

@@ -12,6 +12,10 @@ BIND_PATHS="/sys /proc /dev /run"
 REMOUNT=0
 # Retrieve cryptdevice name from boot cmdline
 CRYPTNAME="$(sed -n 's/.*cryptdevice=[^: ]*:\([^: ]*\).*$/\1/p' /proc/cmdline)"
+# Retrieve cryptkey from boot cmdline
+CRYPTKEYDEV="$(sed -n 's/.*cryptkey=\([^: ]*\).*$/\1/p' /proc/cmdline)"
+CRYPTKEYFS="$(sed -n 's/.*cryptkey=[^: ]*:\([^: ]*\).*$/\1/p' /proc/cmdline)"
+CRYPTKEYFILE="$(sed -n 's/.*cryptkey=[^: ]*:[^: ]*:\([^: ]*\).*$/\1/p' /proc/cmdline)"
 
 # run_dir DIR ARGS...
 # Run all executable scripts in directory DIR with arguments ARGS
@@ -71,7 +75,7 @@ sync
 
 # Hand over execution to script inside initramfs
 cd "${INITRAMFS_DIR}"
-chroot . /suspend "$CRYPTNAME"
+chroot . /suspend "$CRYPTNAME" "$CRYPTKEYDEV" "$CRYPTKEYFS" "$CRYPTKEYFILE"
 
 # Restore original mount options if necessary
 if ((REMOUNT)); then

initramfs-suspend

@@ -1,6 +1,10 @@
 #!/usr/bin/ash
 
 cryptname="${1}"
+cryptkeydev="${2}"
+cryptkeyfs="${3}"
+cryptkeyfile="${4}"
+cryptkeymountpoint="/rootkey"
 
 # Start udev from initramfs
 /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never
@@ -11,9 +15,24 @@ cryptname="${1}"
 # Suspend the system
 echo mem > /sys/power/state
 
+# Mount keydev
+if [ -n "${cryptkeydev}" ] && [ -n "${cryptkeyfs}" ] && [ -n "${cryptkeyfile}" ]
+then
+    mkdir "${cryptkeymountpoint}"
+    while ! mount -t "${cryptkeyfs}" "${cryptkeydev}" "${cryptkeymountpoint}"; do sleep 2; done
+    lukskeyfilearg="--key-file ${cryptkeymountpoint}${cryptkeyfile}"
+fi
+
 # Resume root device
 [ -z "${cryptname}" ] ||
-    while ! cryptsetup luksResume "${cryptname}"; do sleep 2; done
+    while ! cryptsetup luksResume ${lukskeyfilearg} "${cryptname}"; do sleep 2; done
+
+# Clean up keyfile
+if [ -d "${cryptkeymountpoint}" ]
+then
+    umount "${cryptkeymountpoint}"
+    rmdir "${cryptkeymountpoint}"
+fi
 
 # Stop udev from initramfs, as the real daemon from rootfs will be restarted
 udevadm control --exit