--- Begin Message ---
Package: partman-crypto
Version: 10
Severity: normal
Tags: patch
As discussed on debian-devel, we should implement on-demand-loading for
partman-crypto so that most of the packages are only loaded if/when the
functionality is needed. This will reduce the memory requirements for an
average install by several MB's.
I've attached the latest version of the patch. This one adds all the
suggestions that the last one received on debian-boot (lowmem check,
progress bar, anna-install only executed once per package).
I've tested the patch to the best of my ability, but since all crypto
packages are currently included, it is hard to test the downloading of
components properly.
Anyways, unless I get some feedback to the contrary, I plan to commit
this patch soonish (probably during the weekend).
Regards,
David
Index: choose_method/crypto/do_option
===================================================================
--- choose_method/crypto/do_option (revision 40192)
+++ choose_method/crypto/do_option (working copy)
@@ -11,14 +11,7 @@
rm -f $part/use_filesystem
rm -f $part/format
-# Set defaults
-if [ -d /lib/partman/ciphers/dm-crypt ]; then
- echo dm-crypt > $part/crypto_type
- crypto_set_defaults $part dm-crypt
-elif [ -d /lib/partman/ciphers/loop-AES ]; then
- echo loop-AES > $part/crypto_type
- crypto_set_defaults $part loop-AES
-else
- exit 1
-fi
+# Set defaults (this also downloads additional components)
+crypto_prepare_method $part dm-crypt || exit 1
+echo dm-crypt > $part/crypto_type
echo crypto > $part/method
Index: debian/control
===================================================================
--- debian/control (revision 40192)
+++ debian/control (working copy)
@@ -8,17 +8,18 @@
Package: partman-crypto
XC-Package-Type: udeb
Architecture: any
-Depends: partman-base (>= 87), partman-crypto-dm, partman-crypto-loop, cdebconf-newt-entropy (>= 0.3), ${shlibs:Depends}, ${misc:Depends}
+Priority: standard
+Depends: partman-base (>= 87), ${shlibs:Depends}, ${misc:Depends}
Description: Add to partman support for block device encryption
Package: partman-crypto-dm
XC-Package-Type: udeb
Architecture: all
-Depends: partman-crypto, crypto-modules, cryptsetup-udeb
+Depends: partman-crypto, crypto-modules, cryptsetup-udeb, cdebconf-newt-entropy (>= 0.3)
Description: Add to partman support for dm-crypt encryption
Package: partman-crypto-loop
XC-Package-Type: udeb
Architecture: all
-Depends: partman-crypto, loop-aes-modules, mount-aes-udeb, gnupg-udeb
+Depends: partman-crypto, loop-aes-modules, mount-aes-udeb, gnupg-udeb, cdebconf-newt-entropy (>= 0.3)
Description: Add to partman support for loop-AES encryption
Index: debian/partman-crypto.templates
===================================================================
--- debian/partman-crypto.templates (revision 40192)
+++ debian/partman-crypto.templates (working copy)
@@ -363,6 +363,18 @@
be destroyed upon each reboot. This should only be used for
swap partitions.
+Template: partman-crypto/install_udebs_failure
+Type: error
+_Description: Failed to download crypto components
+ An error occurred trying to download additional crypto components.
+
+Template: partman-crypto/install_udebs_low_mem
+Type: boolean
+_Description: Proceed to install crypto components despite insufficient memory?
+ There does not seem to be sufficient memory available to install
+ additional crypto components. Would you like to go ahead and try
+ anyway? Note that this may crash the installation process.
+
Template: partman-crypto/warning_experimental_nonaudit
Type: boolean
Default: false
Index: active_partition/crypto_type/do_option
===================================================================
--- active_partition/crypto_type/do_option (revision 40192)
+++ active_partition/crypto_type/do_option (working copy)
@@ -25,19 +25,30 @@
done
)
+ if [ -z "$choices" ]; then
+ return 1
+ fi
+
template="partman-crypto/crypto_type"
if ! debconf_select critical $template "$choices" ""; then
- return
+ return 1
fi
type=$RET
+
echo $type > $part/crypto_type
- crypto_set_defaults $part $type
+ crypto_prepare_method $part $type || return 1
+
+ return 0
}
[ -f $part/method ] || exit 0
method=$(cat $part/method)
if [ $method = crypto ]; then
- select_crypto_type
+ # Load all known crypto types
+ crypto_load_udebs partman-crypto-dm
+ crypto_load_udebs partman-crypto-loop
+
+ select_crypto_type || return 1
fi
Index: crypto_tools.sh
===================================================================
--- crypto_tools.sh (revision 40192)
+++ crypto_tools.sh (working copy)
@@ -381,7 +381,7 @@
for module in $(cat $modulefile); do
if [ -f $moduledir/$module ]; then
# Already loaded
- continue;
+ continue
fi
if modprobe -q $module; then
@@ -396,9 +396,56 @@
return 0
}
-# Does initial setup for a crypto method:
-# 1) sets default values
-# 2) loads default modules
+# Loads additional crypto udebs
+crypto_load_udebs() {
+ local packages udebdir package memfree
+ packages="$1"
+ udebdir=/var/run/partman-crypto/udebs
+
+ if [ -z "$packages" ]; then
+ return 0
+ fi
+
+ if [ ! -d $udebdir ]; then
+ mkdir -p $udebdir
+ fi
+
+
+ for package in $packages; do
+ if [ -f $udebdir/$package ]; then
+ continue
+ fi
+
+ if [ -e /proc/meminfo ]; then
+ memfree=$(grep MemFree /proc/meminfo | head -1 | \
+ sed 's/.*:[[:space:]]*\([0-9]*\).*/\1/')
+ # A more or less arbitrary limit
+ if [ "$memfree" -lt 10000 ]; then
+ db_set partman-crypto/install_udebs_low_mem false
+ db_fset partman-crypto/install_udebs_low_mem seen false
+ db_input critical partman-crypto/install_udebs_low_mem
+ db_go || true
+ db_get partman-crypto/install_udebs_low_mem
+ if [ "$RET" != true ]; then
+ return 1
+ fi
+ fi
+ fi
+
+ if ! anna-install $package; then
+ db_fset partman-crypto/install_udebs_failure seen false
+ db_input critical partman-crypto/install_udebs_failure
+ db_go || true
+ return 1
+ fi
+
+ touch $udebdir/$package
+ done
+
+ return 0
+}
+
+# Sets the defaults for a given crypto type
crypto_set_defaults () {
local part type
part=$1
@@ -422,9 +469,53 @@
rm -f $part/keyhash
;;
esac
+ return 0
+}
- # Also load the modules needed for the chosen type/cipher
- crypto_load_modules $type "$(cat $part/cipher)"
+# Does initial setup for a crypto method:
+# 1) Loads the appropriate udebs
+# 2) Loads the appropriate kernel modules
+# 3) Sets default values
+crypto_prepare_method () {
+ local part type package
+ part=$1
+ type=$2
+ package=''
+
+ [ -d $part ] || return 1
+ case $type in
+ dm-crypt)
+ package="partman-crypto-dm"
+ ;;
+ loop-AES)
+ package="partman-crypto-loop"
+ ;;
+ *)
+ return 1
+ ;;
+ esac
+
+ # 1A - Pull in the method package and additional dependencies
+ if ! crypto_load_udebs $package; then
+ return 1
+ fi
+
+ # 1B - Verify that it worked
+ if ! crypto_check_required_tools $type; then
+ return 1
+ fi
+
+ # 2 - Also load the kernel modules needed for the chosen type/cipher
+ if ! crypto_load_modules $type $(cat $part/cipher); then
+ return 1
+ fi
+
+ # 3 - Finally, set the defaults for the chosen type
+ if ! crypto_set_defaults $part $type; then
+ return 1
+ fi
+
+ return 0
}
crypto_check_required_tools() {
@@ -438,6 +529,8 @@
loop-AES)
tools="/bin/blockdev-keygen /usr/bin/gpg /bin/base64"
;;
+ *)
+ return 1
esac
for tool in $tools; do
--- End Message ---
--- Begin Message ---
Source: partman-crypto
Source-Version: 11
We believe that the bug you reported is fixed in the latest version of
partman-crypto, which is due to be installed in the Debian FTP archive:
partman-crypto-dm_11_all.udeb
to pool/main/p/partman-crypto/partman-crypto-dm_11_all.udeb
partman-crypto-loop_11_all.udeb
to pool/main/p/partman-crypto/partman-crypto-loop_11_all.udeb
partman-crypto_11.dsc
to pool/main/p/partman-crypto/partman-crypto_11.dsc
partman-crypto_11.tar.gz
to pool/main/p/partman-crypto/partman-crypto_11.tar.gz
partman-crypto_11_i386.udeb
to pool/main/p/partman-crypto/partman-crypto_11_i386.udeb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 384532@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Max Vozeler <xam@debian.org> (supplier of updated partman-crypto package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Mon, 28 Aug 2006 20:35:57 +0200
Source: partman-crypto
Binary: partman-crypto-dm partman-crypto partman-crypto-loop
Architecture: source i386 all
Version: 11
Distribution: unstable
Urgency: low
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Changed-By: Max Vozeler <xam@debian.org>
Description:
partman-crypto - Add to partman support for block device encryption (udeb)
partman-crypto-dm - Add to partman support for dm-crypt encryption (udeb)
partman-crypto-loop - Add to partman support for loop-AES encryption (udeb)
Closes: 384532
Changes:
partman-crypto (11) unstable; urgency=low
.
[ David Härdeman ]
* Make partman-crypto-dm and partman-crypto-loop not installed by
default and instead do on-demand loading in d-i (closes: #384532)
.
[ Max Vozeler ]
* Some minor code cleanups
.
[ Updated translations ]
* Czech (cs.po) by Miroslav Kure
* Danish (da.po) by Claus Hindsgaul
* German (de.po) by Jens Seidel
* French (fr.po) by Christian Perrier
* Galician (gl.po) by Jacobo Tarrio
* Indonesian (id.po) by Arief S Fitrianto
* Italian (it.po) by Giuseppe Sacco
* Japanese (ja.po) by Kenshi Muto
* Dutch (nl.po) by Bart Cornelis
* Portuguese (Brazil) (pt_BR.po) by André LuÃs Lopes
* Portuguese (pt.po) by Miguel Figueiredo
* Romanian (ro.po) by Eddy PetriÅ?or
* Russian (ru.po) by Yuri Kozlov
* Northern Sami (se.po) by Børre Gaup
* Slovak (sk.po) by Peter Mann
* Swedish (sv.po) by Daniel Nylander
* Thai (th.po) by Theppitak Karoonboonyanan
* Tagalog (tl.po) by Eric Pareja
* Turkish (tr.po) by Recai OktaÅ?
Files:
4a710361c9dcb904ea4ed599f748e738 609 debian-installer standard partman-crypto_11.dsc
dcc17b3c7fd94b81ada6123247259c3f 237351 debian-installer standard partman-crypto_11.tar.gz
51e401d26398f203abce705d0e8a81b4 1386 debian-installer optional partman-crypto-dm_11_all.udeb
0ed23f6a24b2a550c4fe539dc95e636c 1238 debian-installer optional partman-crypto-loop_11_all.udeb
90149e6ef1d9f70f5f4f6d427775448d 169916 debian-installer standard partman-crypto_11_i386.udeb
Package-Type: udeb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
iD8DBQFE8zftnVvVEbfNotwRAsmjAKC18FAlEkOEw0QddZ98It2eO7pLAwCfd231
NjZBd/mKhc3RQWAAPcZY4J4=
=fezo
-----END PGP SIGNATURE-----
--- End Message ---