cryptsetup: Implement offset and skip options

Closes: #751707
LP: #953875

debian/changelog

+systemd (215-17) UNRELEASED; urgency=medium
+
+  * cryptsetup: Implement offset and skip options. (Closes: #751707,
+    LP: #953875)
+
+ -- Martin Pitt <mpitt@debian.org>  Thu, 16 Apr 2015 07:12:08 -0500
+
 systemd (215-16) unstable; urgency=medium
 
   [ Christian Seiler ]

debian/patches/cryptsetup-Implement-offset-and-skip-options.patch

+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Thu, 16 Apr 2015 06:44:07 -0500
+Subject: cryptsetup: Implement offset and skip options
+
+These are useful for plain devices as they don't have any metadata by
+themselves. Instead of using an unreliable hardcoded device name in crypttab
+you can then put static meatadata at the start of the partition for a stable
+UUID or label.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=87717
+https://bugs.debian.org/751707
+https://launchpad.net/bugs/953875
+---
+ src/cryptsetup/cryptsetup.c | 21 +++++++++++++++++++--
+ 1 file changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
+index a67d85e..a7c7eb2 100644
+--- a/src/cryptsetup/cryptsetup.c
++++ b/src/cryptsetup/cryptsetup.c
+@@ -50,12 +50,12 @@ static bool arg_discards = false;
+ static bool arg_tcrypt_hidden = false;
+ static bool arg_tcrypt_system = false;
+ static char **arg_tcrypt_keyfiles = NULL;
++static uint64_t arg_offset = 0;
++static uint64_t arg_skip = 0;
+ static usec_t arg_timeout = 0;
+ 
+ /* Options Debian's crypttab knows we don't:
+ 
+-    offset=
+-    skip=
+     precheck=
+     check=
+     checkargs=
+@@ -168,6 +168,20 @@ static int parse_one_option(const char *option) {
+                         return 0;
+                 }
+ 
++        } else if (startswith(option, "offset=")) {
++
++                if (safe_atou64(option+7, &arg_offset) < 0) {
++                        log_error("offset= parse failure, ignoring.");
++                        return 0;
++                }
++
++        } else if (startswith(option, "skip=")) {
++
++                if (safe_atou64(option+5, &arg_skip) < 0) {
++                        log_error("skip= parse failure, ignoring.");
++                        return 0;
++                }
++
+         } else if (!streq(option, "none"))
+                 log_error("Encountered unknown /etc/crypttab option '%s', ignoring.", option);
+ 
+@@ -403,6 +417,9 @@ static int attach_luks_or_plain(struct crypt_device *cd,
+                 } else
+                         params.hash = "ripemd160";
+ 
++                params.offset = arg_offset;
++                params.skip = arg_skip;
++
+                 if (arg_cipher) {
+                         size_t l;
+ 

debian/patches/series

@@ -204,3 +204,4 @@ PrivateTmp-shouldn-t-require-tmpfs.patch
 sysv-generator-add-support-for-etc-insserv-overrides.patch
 syslog-Increase-max_dgram_qlen-by-pulling-in-systemd.patch
 Skip-filesystem-check-if-already-done-by-the-initram.patch
+cryptsetup-Implement-offset-and-skip-options.patch