Attachment 144395 Details for Bug 220768 – corrected /etc/rc.dc/rc.sysinit patch

[patch] corrected /etc/rc.dc/rc.sysinit patch

rc.sysinit.patch2 (text/plain), 1019 bytes, created by Mike Breen on 2006-12-27 11:55:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mike Breen

Created: 2006-12-27 11:55:38 UTC

Size: 1019 bytes

patch

obsolete

>--- /etc/rc.d/rc.sysinit	2006/12/25 07:25:19	1.2
>+++ /etc/rc.d/rc.sysinit	2006/12/27 11:19:51	1.4
>@@ -208,10 +208,33 @@
> 		    "ignoring them"
> 	    fi
> 	    /sbin/cryptsetup ${key:+-d $key} luksOpen "$src" "$dst" <&1
>+	    rc=$?
> 	else
>-	    /sbin/cryptsetup $params ${key:+-d $key} create "$dst" "$src" <&1
>+	    while ((1)); do
>+		/sbin/cryptsetup $params ${key:+-d $key} create "$dst" "$src" <&1
>+		rc=$?
>+		if [ $rc -ne 0 ]; then
>+		    break;
>+		elif [ -n "$key" -a "x$key" != "xnone" ]; then
>+		    break;
>+		elif blkid "/dev/mapper/$dst" >/dev/null; then
>+		    break;
>+		fi
>+		echo "/dev/mapper/$dst is not a recognized block device -" \
>+		    "passphrase may be incorrect."
>+		echo -n "Try again (y/[n])? "
>+		read AGAIN <&1
>+		case "$AGAIN" in
>+		    Y|yes|Yes|YES)
>+			AGAIN=y
>+			;;
>+		esac
>+		if [ "$AGAIN" != "y" ]; then
>+		    break
>+		fi
>+		/sbin/cryptsetup remove "$dst"
>+	    done
> 	fi
>-	rc=$?
> 	if [ -z "$key" -a -x /usr/bin/rhgb-client ] \
> 	    && /usr/bin/rhgb-client --ping ; then
> 	    chvt 8

Actions: View | Diff

Attachments on bug 220768: 144366 | 144395