Bug#773157: systemd-cryptsetup-generator does not like crypttab option tmp=ext2

[Jerad Simpson]

Package: systemd
Version: 215-7
Severity: normal
Tags: patch

The following configuration causes boot to wait 1 minute and 30 seconds
before starting an emergency root shell.

/etc/crypttab:
vg0-tmp_crypt /dev/vg0/tmp /dev/urandom tmp=ext2,cipher=aes-xts-benbi,hash=sha512,size=512,noearly

/etc/fstab:
/dev/mapper/vg0-tmp_crypt /tmp ext2    rw,nosuid,nodev          0    2

In the has_option function of cryptsetup-generator.c, the following line:
if (f[l] != 0 && f[l] != ',') {

can be changed to:
if (f[l] != 0 && f[l] != ',' && f[l] != '=') {

This cures the problem on my systems, but a more in-depth patch might
actually respect the filesystem type listed in /etc/crypttab.  It appears
that the device is always formatted as ext2, no matter what is
prescribed.

-- Package-specific info:

-- System Information:
Debian Release: 8.0
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages systemd depends on:
ii  acl             2.2.52-2
ii  adduser         3.113+nmu3
ii  initscripts     2.88dsf-58
ii  libacl1         2.2.52-2
ii  libaudit1       1:2.4-1+b1
ii  libblkid1       2.25.2-3
ii  libc6           2.19-13
ii  libcap2         1:2.24-6
ii  libcap2-bin     1:2.24-6
ii  libcryptsetup4  2:1.6.6-3
ii  libgcrypt20     1.6.2-4+b1
ii  libkmod2        18-3
ii  liblzma5        5.1.1alpha+20120614-2+b3
ii  libpam0g        1.1.8-3.1
ii  libselinux1     2.3-2
ii  libsystemd0     215-7
ii  mount           2.25.2-3
ii  sysv-rc         2.88dsf-58
ii  udev            215-7
ii  util-linux      2.25.2-3

Versions of packages systemd recommends:
ii  dbus            1.8.12-1
ii  libpam-systemd  215-7

Versions of packages systemd suggests:
pn  systemd-ui  <none>

-- no debconf information