← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/initramfs/cryptroot-hook

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook
  • Date: 2009-05-10 17:29:32 UTC
  • mfrom: (0.1.4 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090510172932-1e485f99qk3psrg0
Tags: 2:1.0.6+20090405.svn49-1ubuntu1
* Merge from debian unstable, remaining changes:
  - Ubuntu specific:
    + debian/rules: link dynamically for better security supportability and
      smaller packages.
    + debian/control: Depend on initramfs-tools so system is not potentially
      rendered unbootable.
  - debian/initramfs/cryptroot-script wait for encrypted device to appear,
    report with log_*_msg (debian bug 488271).
  - debian/initramfs/cryptroot-hook: fix support for UUID and LABEL
    correlation between fstab and crypttab (debian bug 522041).
  - debian/askpass.c, debian/initramfs/cryptroot-script: using newline
    escape in passphrase prompt to avoid line-wrapping (debian bug 528133).
* Drop 04_fix_udevsettle_call.patch: fixed upstream differently.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/initramfs/cryptroot-hook
224
224
                                        return 1
225
225
                                fi
226
226
                                KEYSCRIPT="$opt"
227
 
                                OPTIONS="$OPTIONS,keyscript=/keyscripts/$(basename "$opt")"
 
227
                                OPTIONS="$OPTIONS,keyscript=/lib/cryptsetup/scripts/$(basename "$opt")"
228
228
                                ;;
229
229
                        tries=*)
230
230
                                OPTIONS="$OPTIONS,$opt"
361
361
 
362
362
                # If we have a keyscript, make sure it is included
363
363
                if [ -n "$KEYSCRIPT" ]; then
364
 
                        if [ ! -d "$DESTDIR/keyscripts" ]; then
365
 
                                mkdir "$DESTDIR/keyscripts"
 
364
                        if [ ! -d "$DESTDIR/lib/cryptsetup/scripts" ]; then
 
365
                                mkdir -p "$DESTDIR/lib/cryptsetup/scripts"
366
366
                        fi
367
367
 
368
368
                        if [ -e "/lib/cryptsetup/scripts/$KEYSCRIPT" ]; then
369
 
                                copy_exec "/lib/cryptsetup/scripts/$KEYSCRIPT" /keyscripts
 
369
                                copy_exec "/lib/cryptsetup/scripts/$KEYSCRIPT" /lib/cryptsetup/scripts
370
370
                        elif [ -e "$KEYSCRIPT" ]; then
371
 
                                copy_exec "$KEYSCRIPT" /keyscripts
 
371
                                copy_exec "$KEYSCRIPT" /lib/cryptsetup/scripts
372
372
                        else
373
373
                                echo "cryptsetup: WARNING: failed to find keyscript $KEYSCRIPT" >&2
374
374
                                continue