← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/cryptdisks.init

  • 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/cryptdisks.init
14
14
 
15
15
set -e 
16
16
 
17
 
INITSTATE="remaining"
18
 
LOUD="yes"
19
 
 
20
17
if [ -r /lib/cryptsetup/cryptdisks.functions ]; then
21
18
        . /lib/cryptsetup/cryptdisks.functions
22
19
else
23
20
        exit 0
24
21
fi
25
22
 
 
23
INITSTATE="remaining"
 
24
LOUD="yes"
 
25
 
26
26
case "$CRYPTDISKS_ENABLE" in
27
27
[Nn]*)
28
28
        exit 0