[Pkg-loop-aes-commits] r1420 - in /trunk/loop-aes-utils: ./ debian/initramfs/hook

[xam at users.alioth.debian.org]

Author: xam
Date: Sat Aug 11 14:22:08 2007
New Revision: 1420

URL: http://svn.debian.org/wsvn/pkg-loop-aes/?sc=1&rev=1420
Log:
Rename variables for clarity

Modified:
    trunk/loop-aes-utils/   (props changed)
    trunk/loop-aes-utils/debian/initramfs/hook

Propchange: trunk/loop-aes-utils/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sat Aug 11 14:22:08 2007
@@ -1,4 +1,4 @@
-02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:9933
+02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:9934
 53348a03-e5de-0310-b097-96e6f85ea926:/import/loop-aes-utils/branches/2.12-alternative:120
 53348a03-e5de-0310-b097-96e6f85ea926:/import/loop-aes-utils/branches/2.12-dpatch:196
 53348a03-e5de-0310-b097-96e6f85ea926:/import/loop-aes-utils/trunk/current:338

Modified: trunk/loop-aes-utils/debian/initramfs/hook
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/initramfs/hook?rev=1420&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/initramfs/hook (original)
+++ trunk/loop-aes-utils/debian/initramfs/hook Sat Aug 11 14:22:08 2007
@@ -113,31 +113,31 @@
 get_root_opts
 loopaes_opts="${loopaes_opts},loop=${rootloop}"
 
-enabled=no
-encrypted=no
+detected=no
+configured=no
 forced=no
 
 if [ -n "${rootloop}" ]; then
-    encrypted=yes
+    detected=yes
 fi
 
 case "${INITRAMFS_LOOPAES}" in
     0|n|no|off|'')
 	;;
     1|y|yes|on)
-	enabled=yes
+	configured=yes
 	forced=yes
 	;;
     auto)
-	enabled="${encrypted}"
+	configured="${detected}"
 	;;
     *)
 	echo "WARNING! (loop-aes) ignoring invalid INITRAMFS_LOOPAES value: '${INITRAMFS_LOOPAES}'" 1>&2
 	;;
 esac
 
-if [ "$enabled" = no ]; then
-    if [ "$encrypted" = yes ]; then
+if [ "$configured" = no ]; then
+    if [ "$detected" = yes ]; then
 	cat >&2 <<END_WARN
 WARNING: Your root partition appears to be encrypted with loop-AES, but
 the initramfs support for loop-AES is disabled. The resulting initramfs
@@ -159,7 +159,7 @@
 END_WARN
 	;;
     *)
-	if [ "$encrypted" = no ]; then
+	if [ "$detected" = no ]; then
 	    cat >&2 <<END_WARN
 WARNING: (loop-aes) Support for loop-AES is forced on but this script was
 unable to determine the loop-AES settings from /etc/fstab. Assuming