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

[xam at users.alioth.debian.org]

Author: xam
Date: Sat Aug 11 23:49:26 2007
New Revision: 1434

URL: http://svn.debian.org/wsvn/pkg-loop-aes/?sc=1&rev=1434
Log:
Make "auto" the default setting for initramfs scripts 

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

Propchange: trunk/loop-aes-utils/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sat Aug 11 23:49:26 2007
@@ -1,4 +1,4 @@
-02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:11017
+02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes-utils:11018
 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/README
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes-utils/debian/README?rev=1434&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/README (original)
+++ trunk/loop-aes-utils/debian/README Sat Aug 11 23:49:26 2007
@@ -31,24 +31,22 @@
   encrypted (or not) loop device. This needs initramfs-tools version
   0.81 or later.
 
-  This support is not automatically enabled by default.
+  This support is enabled by default if your root device in /etc/fstab
+  has a "loop=/dev/loopN" option.
 
-  You can activate the support by setting INITRAMFS_LOOPAES in
+  You can forcily enable the support by setting INITRAMFS_LOOPAES in 
   /etc/initramfs-tools/initramfs.conf or in the shell calling
-  mkinitramfs to "auto" or "yes". The recommended setting is "auto".
-  It checks at initramfs creation time if your root device in
-  /etc/fstab has a "loop=/dev/loopN" option. You can also forcibly
-  activate the support with "yes" or force it off with "no". An
-  example of a reason to force it off would be because you have custom
-  scripts to handle a specific situation in your initramfs
-  (e.g. reading the keys from a removable media, from the network,
-  ...).
+  mkinitramfs to "yes". The recommended setting is "auto". You can 
+  also forcibly disable the support with "no". An example of a reason
+  to force it off would be because you have custom scripts to handle a
+  specific situation in your initramfs (e.g. reading the keys from a
+  removable media, from the network, ...).
 
   Wether you set INITRAMFS_LOOPAES in the shell before running
   mkinitramfs or in /etc/initramfs-tools/initramfs.conf, don't forget
   to export it. For example:
 
-   INITRAMFS_LOOPAES=auto
+   INITRAMFS_LOOPAES=no
    export INITRAMFS_LOOPAES
 
   When support is forced on, support for all ciphers is included; when
@@ -87,13 +85,6 @@
 
   When doing the boot manually from the initramfs shell, remember you
   don't have the loop-aes-utils version of mount; you need to use
-  losetup and then "mount /dev/loopN /root".
-
-  The integration sets the umask for the initramfs to 600 if it thinks
-  it is necessary (if it copies cryptographic keys in the initramfs);
-  you can override this by creating a file
-  /etc/initramfs-tools/conf.d/loopaes that sets the UMASK shell
-  variable (or not); mere existence of this file (even if it is empty)
-  disables the loopaes automatic determination.
+  /sbin/losetup and then "mount /dev/loopN /root".
 
  -- Max Vozeler <xam at debian.org> and Lionel Elie Mamane <lmamane at debian.org>

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=1434&op=diff
==============================================================================
--- trunk/loop-aes-utils/debian/initramfs/hook (original)
+++ trunk/loop-aes-utils/debian/initramfs/hook Sat Aug 11 23:49:26 2007
@@ -121,14 +121,14 @@
     detected=yes
 fi
 
-case "${INITRAMFS_LOOPAES}" in
-    0|n|no|off|'')
+case "${LOOP_AES_INITRAMFS}" in
+    0|n|no|off)
 	;;
     1|y|yes|on)
 	configured=yes
 	forced=yes
 	;;
-    auto)
+    auto|'')
 	configured="${detected}"
 	;;
     *)