From e78eb58de44fa22bce5f363b7ca02c8e9a26372a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 4 Aug 2009 16:52:34 +0200 Subject: [PATCH] Looking for persistency partitions on luks devices only if we boot with persistent=cryptsetup. In order to determine if a encrypted partition contains a persistent partition for live-initramfs, we do have to open it and look into it. Open means, that the user has to provide the passphase (or key). A user booting a *default* debian-live system on a machine that has cryptesetup encrypted partitions should not be bothered by *default* to enter all his passphrases during the boot process. Also, encrypted persistency is only usefull when the user knows about it (= the passphrase to access it). Therefore, it's better to by default ignore persistency on luks devices. --- scripts/live-helpers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/live-helpers b/scripts/live-helpers index 978aa06..d5ad29f 100644 --- a/scripts/live-helpers +++ b/scripts/live-helpers @@ -328,7 +328,7 @@ find_cow_device () fi # Checking for a luks device - if [ -e /sbin/cryptsetup ] && /sbin/cryptsetup isLuks ${devname} + if [ "${PERSISTENT}" = "cryptsetup" ] && [ -e /sbin/cryptsetup ] && /sbin/cryptsetup isLuks ${devname} then while true do -- 2.1.4