Bug#378488: [Pkg-loop-aes-maint] Re: Bug#378488: v5 of initramfs-tools root fs on loop integration

[Max Vozeler]

Hey all,

On Sat, Nov 11, 2006 at 05:39:56PM +0100, Max Vozeler wrote:
> Indeed, that's one nice advantage I didn't think about yet. Let's go
> for this approach. I'll have some time later tonight where I could
> check which changes are required for the scripts and documentation

This was rather straight forward. I've commited the attached patch
to SVN.. does it look OK to you?

cheers,
Max
-------------- next part --------------
Index: debian/changelog
===================================================================
--- debian/changelog	(Revision 1320)
+++ debian/changelog	(Arbeitskopie)
@@ -1,11 +1,11 @@
 loop-aes-utils (2.12r-15) UNRELEASED; urgency=low
 
   * Set Maintainer to Debian Loop-AES Team
-  * Enable initramfs-tools integration for encrypted root, thanks to
+  * Include initramfs-tools integration for encrypted root, thanks to
     Lionel Elie Mamane <lionel at debian.org> (Closes: #378488)
   * Update config.sub to 2006-09-20
 
- -- Max Vozeler <xam at debian.org>  Sun, 22 Oct 2006 19:01:50 +0200
+ -- Max Vozeler <xam at debian.org>  Sat, 11 Nov 2006 14:31:16 +0100
 
 loop-aes-utils (2.12r-14) unstable; urgency=low
 
Index: debian/initramfs-tools-hook
===================================================================
--- debian/initramfs-tools-hook	(Revision 1320)
+++ debian/initramfs-tools-hook	(Arbeitskopie)
@@ -24,10 +24,15 @@
     1|yes|on)
 	FORCE_LOOPAES=1
 	;;
-    auto|)
+    auto)
 	;;
+    '')
+    	# Default not doing anything
+	exit 0
+	;;
     *)
 	echo "WARNING! (loop-aes) ignoring invalid INITRAMFS_LOOPAES value: '${INITRAMFS_LOOPAES}'" 1>&2
+	;;
 esac
 
 . /usr/share/initramfs-tools/hook-functions
Index: debian/NEWS.Debian
===================================================================
--- debian/NEWS.Debian	(Revision 1320)
+++ debian/NEWS.Debian	(Arbeitskopie)
@@ -1,11 +1,8 @@
 loop-aes-utils (2.12r-15) unstable; urgency=low
 
   * This version includes support for root on loop-aes encrypted
-    device when using an initramfs-tools generated initramfs.
-
-    If you had a working loop-aes encrypted root and you are using
-    initramfs-tools, this support may interfere and cause initramfs-tools
-    to produce an initramfs that will not boot your system. See
+    device when using an initramfs-tools generated initramfs. The
+    support is not enabled by default. See
     /usr/share/doc/loop-aes-utils/README.Debian.gz for details.
 
  -- Lionel Elie Mamane <lmamane at debian.org>  Sun,  6 Aug 2006 15:20:24 +0200
Index: debian/README
===================================================================
--- debian/README	(Revision 1320)
+++ debian/README	(Arbeitskopie)
@@ -31,13 +31,14 @@
   encrypted (or not) loop device. This needs initramfs-tools version
   0.81 or later.
 
-  This support is automatically enabled at initramfs creation time
-  when your root device in /etc/fstab has a "loop=/dev/loopN"
-  option. You can also force it on by setting the environmental
-  variable INITRAMFS_LOOPAES to "1", "yes" or "on"; you can force it
-  off by setting INITRAMFS_LOOPAES to "0", "no" or
-  "off". INITRAMFS_LOOPAES can be set in the shell calling mkinitramfs
-  or in /etc/initramfs-tools/initramfs.conf .
+  This support is not automatically enabled by default.
+  
+  You can activate 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".
 
   When support is forced on, support for all ciphers is included; when
   automatically enabled, only the necessary cipher module is included
Index: debian/initramfs-tools-conf
===================================================================
--- debian/initramfs-tools-conf	(Revision 1320)
+++ debian/initramfs-tools-conf	(Arbeitskopie)
@@ -1,3 +1,5 @@
+# This script is sourced by initramfs-tools; It should not exit
+
 get_rootoptions() {
     [ -r /etc/fstab ] || return
 
@@ -18,8 +20,12 @@
 	    ;;
 	1|yes|on)
 	    ;;
-	auto|)
+	auto)
 	    ;;
+	'')
+	    # Default to not doing anything
+	    return 1
+	    ;;
 	*)
 	    echo "WARNING! (loop-aes) ignoring invalid INITRAMFS_LOOPAES value: '${INITRAMFS_LOOPAES}'" 1>&2
     esac