← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/cryptsetup/oneiric

« back to all changes in this revision

Viewing changes to debian/scripts/cryptdisks_stop

  • 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/scripts/cryptdisks_stop
23
23
        exit 0
24
24
fi
25
25
 
 
26
LOUD="yes"
 
27
 
26
28
log_action_begin_msg "Stopping crypto disk"
27
29
 
 
30
found="no"
28
31
egrep -v "^[[:space:]]*(#|$)" "$TABFILE" | while read dst src key opts; do
29
32
        if [ "$1" = "$dst" ]; then
 
33
                found="yes"
30
34
                handle_crypttab_line_stop "$dst" "$src" "$key" "$opts" <&3
31
35
                exit 0
32
36
        fi
33
37
done 3<&1
34
38
 
 
39
if [ "$found" = "no" ]; then
 
40
        device_msg "$1" "failed, not found in crypttab"
 
41
fi
 
42
 
35
43
log_action_end_msg 0