[pkg-cryptsetup-devel] Bug#507721: Bug#507721: cryptsetup: Sometimes initrd ends up missing conf/conf.d/cryptroot file in it

[Jonas Meurer]

On 16/12/2008 Christian Jaeger wrote:
> > I've just prepared cryptsetup 1.0.6-7 with this bug and several others
> > fixed. Would you mind testing the packages before I actually upload them
> > to unstable and ask for inclusion in lenny? Many changes since 1.0.6-6
> > are documentation improvements, but there are also some code fixes in
> > initscripts, initramfs scripts and keyscripts.
> >
> > you can find the packages at http://people.debian.org/~mejo/cryptsetup/
> >   
> 
> I've tested with my now usual "cheap" approach, i.e. checking the
> contents of the generated initrd (I can't boot right now because of some
> other ongoing work). Your version didn't work according to this testing,
> as can be seen from the attached observation log. I've then done one
> change, namely remove the double quotes from $depnode
> 
> http://christianjaeger.ch/dyn/pubgit/gitweb?p=cryptroot-debugging.git;a=commitdiff;h=ac6be141ffbb8bf05d6f6a3f57bf67c4fb2a8dbf
> 
> and with this it now works. When I made my comment about not using
> double quotes there I really meant it, I saw from the debugging session
> that $depnode has like 5-10 spaces and/or tabs appended.

Yes, it's true that $depnode had spaces added. I initially added an
extra sed at the end of the line to remove those trailing whitespaces,
somehow this change didn't make it into the packages I built.

I think that quoting variables should be done where possible, so now
the code actually looks like the following:

[...]
depnode=$(dmsetup ls | sed -n "s/\\([^ ]*\\) *($maj, $min)/\\1/p" | sed -e "s/[ \t]*$//")
[...]
depnode=$(dmsetup ls | sed -n "s/\\([^ ]*\\) *($maj, $min)/\\1/p" | sed -e "s/[ \t]*$//")
if [ "$(dmsetup table $depnode 2> /dev/null | cut -d' ' -f3)" != "crypt" ]; then
	get_lvm_deps "$depnode"
	continue
fi
[...]

I've updated the packages at http://people.debian.org/~mejo/cryptsetup/,
could you test them again?

greetings,
 jonas