Attachment 157448 Details for Bug 242078 – enhanced patch to support /dev/disk/by-uuid/* in /etc/crypttab

[patch] enhanced patch to support /dev/disk/by-uuid/* in /etc/crypttab

rc.sysinit.patch (text/plain), 1.40 KB, created by Karsten Hopp on 2007-06-20 11:28:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Karsten Hopp

Created: 2007-06-20 11:28:11 UTC

Size: 1.40 KB

patch

obsolete

>--- rc.sysinit.crypt	2007-06-01 10:44:45.000000000 +0200
>+++ rc.sysinit	2007-06-20 13:25:45.000000000 +0200
>@@ -119,10 +119,12 @@
> 	fi
> 	if [ -n "$key" -a "x$key" != "xnone" ]; then
> 	    if test -e "$key" ; then
>-		mode=$(ls -l "$key" | cut -c 5-10)
> 		owner=$(ls -l $key | awk '{ print $3 }')
>-		if [ "$mode" != "------" ] && ! key_is_random "$key"; then
>-		    echo $"INSECURE MODE FOR $key"
>+		if ! key_is_random "$key"; then
>+		    mode=$(ls -l "$key" | cut -c 5-10)
>+		    if [ "$mode" != "------" ]; then
>+		       echo $"INSECURE MODE FOR $key"
>+		    fi
> 		fi
> 		if [ "$owner" != root ]; then
> 		    echo $"INSECURE OWNER FOR $key"
>@@ -139,6 +141,13 @@
> 	makeswap=""
> 	mke2fs=""
> 	skip=""
>+	# Parse the src field for UUID= and convert to real device names
>+	if [ "${src%%=*}" == "UUID" ]; then
>+		src=`/sbin/blkid -t "$src" -o device`
>+	else if [ "${src/^\/dev\/disk\/by-uuid\/}" != "$src" ]; then
>+		src=`/bin/ls -l $src | awk '{ 
>+			gsub("../../","",$10); print "/dev/"$10 }'`
>+	fi
> 	# Parse the options field, convert to cryptsetup parameters
> 	# and contruct the command line
> 	while [ -n "$opt" ]; do
>@@ -200,7 +209,7 @@
> 	    fi
> 	    /sbin/cryptsetup ${key:+-d $key} luksOpen "$src" "$dst" <&1
> 	else
>-	    /sbin/cryptsetup $params ${key:+-d $key} create "$dst" "$src" <&1
>+	    /sbin/cryptsetup $params ${key:+-d $key} create "$dst" "$src" <&1 2>/dev/null
> 	fi
> 	rc=$?
> 	if [ -z "$key" -a -x /usr/bin/rhgb-client ] \

Actions: View | Diff

Attachments on bug 242078: 155994 | 157448