[PATCH] Need to still 'continue' (meaning, stop looping) after recursion (?)

Christian Jaeger christian at jaeger.mine.nu
Wed Dec 10 22:24:40 UTC 2008


I'm not sure why, but otherwise, we get this:

++ for node in '$nodes'
++ '[' 2 -eq 2 ']'
++ '[' -z '' ']'
++ opts=lvm=main-root
++ get_device_opts main-root-real lvm=main-root
++ local target source link extraopts rootopts opt
++ target=main-root-real
++ extraopts=lvm=main-root
++ KEYSCRIPT=
++ OPTIONS=
++ '[' -z main-root-real ']'
+++ grep '^main-root-real' /etc/crypttab
+++ head -1
+++ sed 's/[[:space:]]\+/ /g'
++ opt=
+++ echo
+++ cut -d ' ' -f2
++ source=
+++ echo
+++ cut -d ' ' -f3
++ key=
+++ echo
+++ cut -d ' ' -f4-
++ rootopts=
++ '[' -z '' ']'
++ echo 'cryptsetup: WARNING: invalid line in /etc/crypttab - '
cryptsetup: WARNING: invalid line in /etc/crypttab -
++ return 1
++ continue

Signed-off-by: Christian Jaeger <christian at jaeger.mine.nu>
---
 debian/initramfs/cryptroot-hook |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/debian/initramfs/cryptroot-hook b/debian/initramfs/cryptroot-hook
index 096c5bb..f8b197e 100644
--- a/debian/initramfs/cryptroot-hook
+++ b/debian/initramfs/cryptroot-hook
@@ -143,7 +143,7 @@ get_lvm_deps() {
 		fi
 		if [ "$(dmsetup table $depnode 2> /dev/null | cut -d' ' -f3)" != "crypt" ]; then
 			get_lvm_deps $depnode  # no quoting here as above there isn't either, and it contains appended whitespace
-			# continue  or not?
+			continue
 		fi
 		echo "$depnode"
 	done
-- 
1.6.0.5


--------------040205070700080306060505
Content-Type: text/x-patch;
 name="0006-Fix-attempt-search-in-kernel-drivers-too.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="0006-Fix-attempt-search-in-kernel-drivers-too.patch"



More information about the pkg-cryptsetup-devel mailing list