From d71dce9460b7e813825404d01b154ce9bc816731 Mon Sep 17 00:00:00 2001
From: CyberLeo <cyberleo@cyberleo.net>
Date: Thu, 21 Nov 2019 20:17:38 -0600
Subject: [PATCH] cdn-patch: offer option to mount /etc/keys before attaching
 geli devices

---
 libexec/rc/rc.d/geli | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/libexec/rc/rc.d/geli b/libexec/rc/rc.d/geli
index f4d87d06ca2..9a714273a5c 100755
--- a/libexec/rc/rc.d/geli
+++ b/libexec/rc/rc.d/geli
@@ -34,11 +34,28 @@
 
 name="geli"
 desc="GELI disk encryption"
-start_precmd='[ -n "$(geli_make_list)" -o -n "${geli_groups}" ]'
+start_precmd="geli_prestart"
 start_cmd="geli_start"
 stop_cmd="geli_stop"
 required_modules="geom_eli:g_eli"
 
+: ${geli_mount_keys_first:=NO}
+
+geli_prestart()
+{
+	if checkyesno geli_mount_keys_first
+	then
+		if ! mount | grep -q "on /etc/keys ("
+		then
+			mount -r /etc/keys
+		fi
+	fi
+
+	[ -n "$(geli_make_list)" -o -n "${geli_groups}" ]
+	return $?
+}
+
+
 # Takes provider
 # Reads key from EFIvar
 # Returns tempfile pathname containing key
-- 
2.45.0