[Pkg-loop-aes-commits] r1419 - in /trunk/loop-aes-utils: ./ debian/initramfs/script

[xam at users.alioth.debian.org]

Author: xam
Date: Sat Aug 11 14:22:02 2007
New Revision: 1419

URL: http://svn.debian.org/wsvn/pkg-loop-aes/?sc=1&rev=1419
Log:
Cleanup

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

Propchange: trunk/loop-aes-utils/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sat Aug 11 14:22:02 2007
@@ -1,4 +1,4 @@
-02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:9932
+02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:9933
 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/script
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/initramfs/script?rev=1419&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/initramfs/script (original)
+++ trunk/loop-aes-utils/debian/initramfs/script Sat Aug 11 14:22:02 2007
@@ -117,20 +117,21 @@
 # Begin real processing
 #
 
-# define crypto variables
+# Define crypto variables
 get_options
+
+# Sanity check
+if [ -z "${rootloop}" ]; then
+    echo "root on loop enabled, but no loop device given"
+    exit 1
+fi
 
 if [ -z "${rootgpghome}" ]; then
     rootgpghome=/.gnupg
 fi
 losetup_opts="${losetup_opts} -G ${rootgpghome}"
 
-if [ -z "${rootloop}" ]; then
-    echo "root on loop enabled, but not loop device given"
-    exit 1
-fi
-
-modprobe -q 
+modprobe -q loop
 for x in "$rootencryption"; do
     modprobe -q "$mod"
 done