Thanks for your work.
Please check your work again, and recreate the diff. In
debian/cryptdisks.functions, there are two chunks of unresolved code.
Below is one of them:
<<<<<<< cryptsetup-1.0.4+svn29-1 (Debian)
case "$CRYPTDISKS_ENABLE" in
[Nn]*)
exit 0
;;
esac
=======
# Always output to console
stdin=`readlink /proc/self/fd/0`
if [ "${stdin#/dev/null}" != "$stdin" ] && [ "$ON_VT" != "yes" ]; then
exec env ON_VT=yes /usr/bin/openvt -f -c `fgconsole` -w $0 "$@"
fi
>>>>>>> cryptsetup-1.0.4+svn26-1ubuntu2 (Ubuntu)
** Changed in: cryptsetup (Ubuntu)
Status: Unconfirmed => Needs Info
--
merge cryptsetup-1.0.4+svn29 from debian unstable
https://bugs.launchpad.net/bugs/114136
You received this bug notification because you are a member of Ubuntu
Bugs, which is the bug contact for Ubuntu.
--
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
