~ubuntu-branches/ubuntu/karmic/cryptsetup/karmic

Viewing all changes in revision 51.

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook
  • Date: 2009-01-06 13:00:16 UTC
  • mfrom: (0.1.3 lenny)
  • Revision ID: james.westby@ubuntu.com-20090106130016-gwvgnhwi1g2x6u6s
Tags: 2:1.0.6-7ubuntu1
* Merge from debian unstable, remaining changes:
  - debian/initramfs/cryptroot-script:
    - must source /scripts/functions to get the log_*_msg() functions.
    - wait for encrypted device to show up (LP 164044, 291752).
    - disable error message 'failed to setup lvm device' (LP 151532).
  - debian/rules:
    - fix location of ltmain.sh (Ubuntu-specific until libtool 2.2.x is
      in Debian unstable).
    - link dynamically (LP 62751).
  - add 04_fix_udevsettle_call.patch: fix path to binary for udevsettle.
* Revert versioned build-depency on libdevmapper-dev, since Ubuntu's
  version is higher now.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: