D36081.id109018.diff
No OneTemporary
Actions

Size

809 B

Referenced Files

None

Subscribers

None

D36081.id109018.diff
View Options

	Index: libexec/rc/rc.d/zfskeys
	===================================================================
	--- libexec/rc/rc.d/zfskeys
	+++ libexec/rc/rc.d/zfskeys
	@@ -45,7 +45,15 @@
	local kl="$2"
	local k="${kl##file://}"

	- if [ "$k" ] && [ -f "$k" ] && [ -s "$k" ] && [ -r "$k" ]; then
	+ if [ "$kl" == "prompt" ]
	+ then
	+ echo "Key prompt for $fs."
	+ if zfs load-key -L "$kl" "$fs" < /dev/tty > /dev/tty 2>/dev/tty ; then
	+ echo "Key loaded for $fs."
	+ else
	+ echo "Key failed to load for $fs."
	+ fi
	+ elif [ "$k" ] && [ -f "$k" ] && [ -s "$k" ] && [ -r "$k" ]; then
	if [ "$(zfs get -Ho value keystatus "$fs")" = 'available' ]; then
	echo "Key already loaded for $fs."
	elif keytest=$(zfs load-key -n -L "$kl" "$fs" 2>&1); then