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

[xam at users.alioth.debian.org]

Author: xam
Date: Sun Aug 12 16:17:44 2007
New Revision: 1446

URL: http://svn.debian.org/wsvn/pkg-loop-aes/?sc=1&rev=1446
Log:
* initramfs/hook: Check that included loop module
  really is loop-AES.

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

Propchange: trunk/loop-aes-utils/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sun Aug 12 16:17:44 2007
@@ -1,4 +1,4 @@
-02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:11027
+02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:11050
 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/changelog
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/changelog?rev=1446&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/changelog (original)
+++ trunk/loop-aes-utils/debian/changelog Sun Aug 12 16:17:44 2007
@@ -1,3 +1,10 @@
+loop-aes-utils (2.13~rc3-2) UNSTABLE; urgency=low
+
+  * initramfs/hook: Check that included loop module
+    really is loop-AES.
+
+ -- Max Vozeler <xam at debian.org>  Sun, 12 Aug 2007 18:15:17 +0200
+
 loop-aes-utils (2.13~rc3-1) unstable; urgency=low
 
   * New upstream release

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=1446&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/initramfs/hook (original)
+++ trunk/loop-aes-utils/debian/initramfs/hook Sun Aug 12 16:17:44 2007
@@ -204,5 +204,24 @@
     done
 fi
 
+# Check that loop is really loop-AES
+have_loopaes=no
+for mod in $(find $DESTDIR -name loop.ko -or -name loop.o); do
+    if grep -q loop_compute_md5_iv_v3 $mod; then
+        have_loopaes=yes
+        break
+    fi
+done
+
+if [ "$have_loopaes" = no ]; then
+    cat >&2 <<END_WARN
+ERROR: (loop-AES): This initramfs does not include the required
+loop-AES kernel module. It will most likely NOT be able to boot 
+your system. Please make sure that you install the loop-AES kernel
+module and regenerate the initramfs before the next reboot.
+END_WARN
+    exit 1
+fi
+
 # Done
 exit 0