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

[xam at users.alioth.debian.org]

Author: xam
Date: Sat Aug 11 14:21:19 2007
New Revision: 1412

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

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

Propchange: trunk/loop-aes-utils/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sat Aug 11 14:21:19 2007
@@ -1,4 +1,4 @@
-02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:9899
+02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:9900
 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-tools-hook
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/initramfs-tools-hook?rev=1412&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/initramfs-tools-hook (original)
+++ trunk/loop-aes-utils/debian/initramfs-tools-hook Sat Aug 11 14:21:19 2007
@@ -123,13 +123,14 @@
 get_root_opts
 loopaes_opts="${loopaes_opts},loop=${rootloop}"
 
+enabled=no
 encrypted=no
+forced=no
+
 if [ -n "${rootloop}" ]; then
     encrypted=yes
 fi
 
-enabled=no
-forced=no
 case "${INITRAMFS_LOOPAES}" in
     0|n|no|off|'')
 	;;
@@ -150,7 +151,7 @@
 	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
-will most likely NOT be able to boot your system (!!!). Please make sure
+will most likely NOT be able to boot your system. Please make sure
 that you have a good initramfs before the next reboot.
 END_WARN
     fi
@@ -160,7 +161,7 @@
 case "${rootdev}" in
     /dev/loop*)
 	cat >&2 <<END_WARN
-WARNING:(loop-aes) According to /etc/fstab, your root device is on a
+WARNING: (loop-aes) According to /etc/fstab, your root device is on a
 loop device. Probably you use the wrong syntax for this script in
 /etc/fstab. See /usr/share/doc/loop-aes-utils/README . The initramfs
 being created will NOT be able to mount your loop-AES encrypted root
@@ -206,13 +207,17 @@
 # for us as what we want there at boot time and at initramfs creation
 # time is not the same!
 rm -f ${DESTDIR}/conf/conf.d/loopaes
+
 echo "LOOPAESOPTS=\"$loopaes_opts\"" > ${DESTDIR}/conf/conf.d/loopaes
+
 copy_exec /sbin/losetup /sbin/
+
 # Allow the correct keymap to be loaded if possible
 if [ -e /bin/loadkeys -a -r /etc/console/boottime.kmap.gz ]; then
 	copy_exec /bin/loadkeys /bin/
 	cp /etc/console/boottime.kmap.gz $DESTDIR/etc/
 fi
+
 manual_add_modules loop
 if [ "${forced}" = no ]; then
     iterate_cipher_module "manual_add_modules" "$rootencryption"