Attachment 84140 Details for Bug 120091 – rc.subr-geli.diff

[patch] rc.subr-geli.diff

rc.subr-geli.diff (text/x-diff), 1.16 KB, created by ota on 2008-02-03 04:02:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ota

Created: 2008-02-03 04:02:56 UTC

Size: 1.16 KB

patch

obsolete

>Index: etc/rc.subr
>===================================================================
>RCS file: /home/ncvs/src/etc/rc.subr,v
>retrieving revision 1.77
>diff -u -r1.77 rc.subr
>--- etc/rc.subr	9 Oct 2007 07:20:44 -0000	1.77
>+++ etc/rc.subr	1 Feb 2008 10:37:45 -0000
>@@ -1415,6 +1415,29 @@
> }
> 
> # Creates a list of providers for GELI encryption.
>+geli_expand_entry()
>+{
>+	local devices3
>+	local entry dev tail
>+	for entry in $@; do
>+		tail="${entry}"
>+		while true; do
>+			dev="${dev}${tail%%.eli*}.eli"
>+			devices3="${devices3} ${dev}"
>+			tail="${entry##${dev}}"
>+			case "${tail}" in
>+			*.eli*)
>+				continue
>+				;;
>+			*)
>+				break
>+				;;
>+			esac
>+		done
>+		dev=""
>+	done
>+	echo ${devices3}
>+}
> geli_make_list()
> {
> 	local devices devices2
>@@ -1435,7 +1458,7 @@
> 		:#*)
> 			continue
> 			;;
>-		*.eli)
>+		*.eli*)
> 			# Skip swap devices.
> 			if [ "${type}" = "swap" -o "${options}" = "sw" -o "${noauto}" = "yes" ]; then
> 				continue
>@@ -1446,7 +1469,7 @@
> 	done < /etc/fstab
> 
> 	# Append providers from geli_devices.
>-	devices="${devices} ${geli_devices}"
>+	devices=`geli_expand_entry "${devices} ${geli_devices}"`
> 
> 	for provider in ${devices}; do
> 		provider=${provider%.eli}

Actions: View | Diff

Attachments on bug 120091: 84140