Isolation of udev code from remaining systemd

This commit is a first attempt to isolate the udev code from the
remaining code base.  It intentionally does not modify any files
but purely delete files which, on a first examination, appear to
not be needed.  This is a sweeping commit which may easily have
missed needed code.  Files can be retrieved by doing a checkout
from the previous commit:

 git checkout 2944f347d0 -- <filename>

3 files changed, 0 insertions, 1010 deletions

diff --git a/src/cryptsetup/Makefile b/src/cryptsetup/Makefile
deleted file mode 120000
index d0b0e8e008..0000000000
--- a/src/cryptsetup/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../Makefile
\ No newline at end of file
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
deleted file mode 100644
index 386714b4fd..0000000000
--- a/src/cryptsetup/cryptsetup-generator.c
+++ /dev/null
@@ -1,449 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-
-#include "log.h"
-#include "util.h"
-#include "unit-name.h"
-#include "mkdir.h"
-#include "virt.h"
-#include "strv.h"
-
-static const char *arg_dest = "/tmp";
-static bool arg_enabled = true;
-static bool arg_read_crypttab = true;
-static char **arg_proc_cmdline_disks = NULL;
-
-static bool has_option(const char *haystack, const char *needle) {
-        const char *f = haystack;
-        size_t l;
-
-        assert(needle);
-
-        if (!haystack)
-                return false;
-
-        l = strlen(needle);
-
-        while ((f = strstr(f, needle))) {
-
-                if (f > haystack && f[-1] != ',') {
-                        f++;
-                        continue;
-                }
-
-                if (f[l] != 0 && f[l] != ',') {
-                        f++;
-                        continue;
-                }
-
-                return true;
-        }
-
-        return false;
-}
-
-static int create_disk(
-                const char *name,
-                const char *device,
-                const char *password,
-                const char *options) {
-
-        char *p = NULL, *n = NULL, *d = NULL, *u = NULL, *from = NULL, *to = NULL, *e = NULL;
-        int r;
-        FILE *f = NULL;
-        bool noauto, nofail;
-
-        assert(name);
-        assert(device);
-
-        noauto = has_option(options, "noauto");
-        nofail = has_option(options, "nofail");
-
-        n = unit_name_from_path_instance("systemd-cryptsetup", name, ".service");
-        if (!n) {
-                r = -ENOMEM;
-                log_error("Failed to allocate unit name.");
-                goto fail;
-        }
-
-        p = strjoin(arg_dest, "/", n, NULL);
-        if (!p) {
-                r = -ENOMEM;
-                log_error("Failed to allocate unit file name.");
-                goto fail;
-        }
-
-        u = fstab_node_to_udev_node(device);
-        if (!u) {
-                r = -ENOMEM;
-                log_error("Failed to allocate device node.");
-                goto fail;
-        }
-
-        d = unit_name_from_path(u, ".device");
-        if (!d) {
-                r = -ENOMEM;
-                log_error("Failed to allocate device name.");
-                goto fail;
-        }
-
-        f = fopen(p, "wxe");
-        if (!f) {
-                r = -errno;
-                log_error("Failed to create unit file: %m");
-                goto fail;
-        }
-
-        fprintf(f,
-                "# Automatically generated by systemd-cryptsetup-generator\n\n"
-                "[Unit]\n"
-                "Description=Cryptography Setup for %%I\n"
-                "Documentation=man:systemd-cryptsetup@.service(8) man:crypttab(5)\n"
-                "SourcePath=/etc/crypttab\n"
-                "Conflicts=umount.target\n"
-                "DefaultDependencies=no\n"
-                "BindsTo=%s dev-mapper-%%i.device\n"
-                "After=systemd-readahead-collect.service systemd-readahead-replay.service %s\n"
-                "Before=umount.target\n",
-                d, d);
-
-        if (!nofail)
-                fprintf(f,
-                        "Before=cryptsetup.target\n");
-
-        if (password && (streq(password, "/dev/urandom") ||
-                         streq(password, "/dev/random") ||
-                         streq(password, "/dev/hw_random")))
-                fputs("After=systemd-random-seed-load.service\n", f);
-        else
-                fputs("Before=local-fs.target\n", f);
-
-        fprintf(f,
-                "\n[Service]\n"
-                "Type=oneshot\n"
-                "RemainAfterExit=yes\n"
-                "TimeoutSec=0\n" /* the binary handles timeouts anyway */
-                "ExecStart=" SYSTEMD_CRYPTSETUP_PATH " attach '%s' '%s' '%s' '%s'\n"
-                "ExecStop=" SYSTEMD_CRYPTSETUP_PATH " detach '%s'\n",
-                name, u, strempty(password), strempty(options),
-                name);
-
-        if (has_option(options, "tmp"))
-                fprintf(f,
-                        "ExecStartPost=/sbin/mke2fs '/dev/mapper/%s'\n",
-                        name);
-
-        if (has_option(options, "swap"))
-                fprintf(f,
-                        "ExecStartPost=/sbin/mkswap '/dev/mapper/%s'\n",
-                        name);
-
-        fflush(f);
-
-        if (ferror(f)) {
-                r = -errno;
-                log_error("Failed to write file: %m");
-                goto fail;
-        }
-
-        if (asprintf(&from, "../%s", n) < 0) {
-                r = -ENOMEM;
-                goto fail;
-        }
-
-        if (!noauto) {
-
-                to = strjoin(arg_dest, "/", d, ".wants/", n, NULL);
-                if (!to) {
-                        r = -ENOMEM;
-                        goto fail;
-                }
-
-                mkdir_parents_label(to, 0755);
-                if (symlink(from, to) < 0) {
-                        log_error("Failed to create symlink '%s' to '%s': %m", from, to);
-                        r = -errno;
-                        goto fail;
-                }
-
-                free(to);
-
-                if (!nofail)
-                        to = strjoin(arg_dest, "/cryptsetup.target.requires/", n, NULL);
-                else
-                        to = strjoin(arg_dest, "/cryptsetup.target.wants/", n, NULL);
-                if (!to) {
-                        r = -ENOMEM;
-                        goto fail;
-                }
-
-                mkdir_parents_label(to, 0755);
-                if (symlink(from, to) < 0) {
-                        log_error("Failed to create symlink '%s' to '%s': %m", from, to);
-                        r = -errno;
-                        goto fail;
-                }
-
-                free(to);
-                to = NULL;
-        }
-
-        e = unit_name_escape(name);
-        to = strjoin(arg_dest, "/dev-mapper-", e, ".device.requires/", n, NULL);
-        if (!to) {
-                r = -ENOMEM;
-                goto fail;
-        }
-
-        mkdir_parents_label(to, 0755);
-        if (symlink(from, to) < 0) {
-                log_error("Failed to create symlink '%s' to '%s': %m", from, to);
-                r = -errno;
-                goto fail;
-        }
-
-        r = 0;
-
-fail:
-        free(p);
-        free(n);
-        free(d);
-        free(e);
-
-        free(from);
-        free(to);
-
-        if (f)
-                fclose(f);
-
-        return r;
-}
-
-static int parse_proc_cmdline(void) {
-        char *line, *w, *state;
-        int r;
-        size_t l;
-
-        if (detect_container(NULL) > 0)
-                return 0;
-
-        r = read_one_line_file("/proc/cmdline", &line);
-        if (r < 0) {
-                log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
-                return 0;
-        }
-
-        FOREACH_WORD_QUOTED(w, l, line, state) {
-                char *word;
-
-                word = strndup(w, l);
-                if (!word) {
-                        r = -ENOMEM;
-                        goto finish;
-                }
-
-                if (startswith(word, "luks=")) {
-                        r = parse_boolean(word + 5);
-                        if (r < 0)
-                                log_warning("Failed to parse luks switch %s. Ignoring.", word + 5);
-                        else
-                                arg_enabled = r;
-
-                } else if (startswith(word, "rd.luks=")) {
-
-                        if (in_initrd()) {
-                                r = parse_boolean(word + 8);
-                                if (r < 0)
-                                        log_warning("Failed to parse luks switch %s. Ignoring.", word + 8);
-                                else
-                                        arg_enabled = r;
-                        }
-
-                } else if (startswith(word, "luks.crypttab=")) {
-                        r = parse_boolean(word + 14);
-                        if (r < 0)
-                                log_warning("Failed to parse luks crypttab switch %s. Ignoring.", word + 14);
-                        else
-                                arg_read_crypttab = r;
-
-                } else if (startswith(word, "rd.luks.crypttab=")) {
-
-                        if (in_initrd()) {
-                                r = parse_boolean(word + 17);
-                                if (r < 0)
-                                        log_warning("Failed to parse luks crypttab switch %s. Ignoring.", word + 17);
-                                else
-                                        arg_read_crypttab = r;
-                        }
-
-                } else if (startswith(word, "luks.uuid=")) {
-                        char **t;
-
-                        t = strv_append(arg_proc_cmdline_disks, word + 10);
-                        if (!t) {
-                                r = log_oom();
-                                goto finish;
-                        }
-                        strv_free(arg_proc_cmdline_disks);
-                        arg_proc_cmdline_disks = t;
-
-                } else if (startswith(word, "rd.luks.uuid=")) {
-
-                        if (in_initrd()) {
-                                char **t;
-
-                                t = strv_append(arg_proc_cmdline_disks, word + 13);
-                                if (!t) {
-                                        r = log_oom();
-                                        goto finish;
-                                }
-                                strv_free(arg_proc_cmdline_disks);
-                                arg_proc_cmdline_disks = t;
-                        }
-
-                } else if (startswith(word, "luks.") ||
-                           (in_initrd() && startswith(word, "rd.luks."))) {
-
-                        log_warning("Unknown kernel switch %s. Ignoring.", word);
-                }
-
-                free(word);
-        }
-
-        r = 0;
-
-finish:
-        free(line);
-        return r;
-}
-
-int main(int argc, char *argv[]) {
-        FILE *f = NULL;
-        int r = EXIT_SUCCESS;
-        unsigned n = 0;
-        char **i;
-
-        if (argc > 1 && argc != 4) {
-                log_error("This program takes three or no arguments.");
-                return EXIT_FAILURE;
-        }
-
-        if (argc > 1)
-                arg_dest = argv[1];
-
-        log_set_target(LOG_TARGET_SAFE);
-        log_parse_environment();
-        log_open();
-
-        umask(0022);
-
-        if (parse_proc_cmdline() < 0)
-                return EXIT_FAILURE;
-
-        if (!arg_enabled) {
-                r = EXIT_SUCCESS;
-                goto finish;
-        }
-
-        STRV_FOREACH(i, arg_proc_cmdline_disks) {
-                char *name, *device;
-                const char *p = *i;
-
-                if (startswith(p, "luks-"))
-                        p += 5;
-
-                name = strappend("luks-", p);
-                device = strappend("UUID=", p);
-
-                if (!name || !device) {
-                        log_oom();
-                        r = EXIT_FAILURE;
-                        free(name);
-                        free(device);
-                        goto finish;
-                }
-
-                if (create_disk(name, device, NULL, NULL) < 0)
-                        r = EXIT_FAILURE;
-
-                free(name);
-                free(device);
-        }
-
-        if (!arg_read_crypttab)
-                return r;
-
-        f = fopen("/etc/crypttab", "re");
-        if (!f) {
-
-                if (errno == ENOENT)
-                        r = EXIT_SUCCESS;
-                else {
-                        r = EXIT_FAILURE;
-                        log_error("Failed to open /etc/crypttab: %m");
-                }
-
-                goto finish;
-        }
-
-        for (;;) {
-                char line[LINE_MAX], *l;
-                char *name = NULL, *device = NULL, *password = NULL, *options = NULL;
-                int k;
-
-                if (!fgets(line, sizeof(line), f))
-                        break;
-
-                n++;
-
-                l = strstrip(line);
-                if (*l == '#' || *l == 0)
-                        continue;
-
-                k = sscanf(l, "%ms %ms %ms %ms", &name, &device, &password, &options);
-                if (k < 2 || k > 4) {
-                        log_error("Failed to parse /etc/crypttab:%u, ignoring.", n);
-                        r = EXIT_FAILURE;
-                        goto next;
-                }
-
-                if (create_disk(name, device, password, options) < 0)
-                        r = EXIT_FAILURE;
-
-        next:
-                free(name);
-                free(device);
-                free(password);
-                free(options);
-        }
-
-finish:
-        if (f)
-                fclose(f);
-
-        strv_free(arg_proc_cmdline_disks);
-
-        return r;
-}
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
deleted file mode 100644
index 56a3b50974..0000000000
--- a/src/cryptsetup/cryptsetup.c
+++ /dev/null
@@ -1,560 +0,0 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
-/***
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include <string.h>
-#include <errno.h>
-#include <sys/mman.h>
-#include <mntent.h>
-
-#include <libcryptsetup.h>
-#include <libudev.h>
-
-#include "log.h"
-#include "util.h"
-#include "path-util.h"
-#include "strv.h"
-#include "ask-password-api.h"
-#include "def.h"
-
-static const char *opt_type = NULL; /* LUKS1 or PLAIN */
-static char *opt_cipher = NULL;
-static unsigned opt_key_size = 0;
-static unsigned opt_keyfile_size = 0;
-static unsigned opt_keyfile_offset = 0;
-static char *opt_hash = NULL;
-static unsigned opt_tries = 0;
-static bool opt_readonly = false;
-static bool opt_verify = false;
-static bool opt_discards = false;
-static usec_t opt_timeout = DEFAULT_TIMEOUT_USEC;
-
-/* Options Debian's crypttab knows we don't:
-
-    offset=
-    skip=
-    precheck=
-    check=
-    checkargs=
-    noearly=
-    loud=
-    keyscript=
-*/
-
-static int parse_one_option(const char *option) {
-        assert(option);
-
-        /* Handled outside of this tool */
-        if (streq(option, "noauto"))
-                return 0;
-
-        if (startswith(option, "cipher=")) {
-                char *t;
-
-                if (!(t = strdup(option+7)))
-                        return -ENOMEM;
-
-                free(opt_cipher);
-                opt_cipher = t;
-
-        } else if (startswith(option, "size=")) {
-
-                if (safe_atou(option+5, &opt_key_size) < 0) {
-                        log_error("size= parse failure, ignoring.");
-                        return 0;
-                }
-
-        } else if (startswith(option, "keyfile-size=")) {
-
-                if (safe_atou(option+13, &opt_keyfile_size) < 0) {
-                        log_error("keyfile-size= parse failure, ignoring.");
-                        return 0;
-                }
-
-        } else if (startswith(option, "keyfile-offset=")) {
-
-                if (safe_atou(option+15, &opt_keyfile_offset) < 0) {
-                        log_error("keyfile-offset= parse failure, ignoring.");
-                        return 0;
-                }
-
-        } else if (startswith(option, "hash=")) {
-                char *t;
-
-                if (!(t = strdup(option+5)))
-                        return -ENOMEM;
-
-                free(opt_hash);
-                opt_hash = t;
-
-        } else if (startswith(option, "tries=")) {
-
-                if (safe_atou(option+6, &opt_tries) < 0) {
-                        log_error("tries= parse failure, ignoring.");
-                        return 0;
-                }
-
-        } else if (streq(option, "readonly"))
-                opt_readonly = true;
-        else if (streq(option, "verify"))
-                opt_verify = true;
-        else if (streq(option, "allow-discards"))
-                opt_discards = true;
-        else if (streq(option, "luks"))
-                opt_type = CRYPT_LUKS1;
-        else if (streq(option, "plain") ||
-                 streq(option, "swap") ||
-                 streq(option, "tmp"))
-                opt_type = CRYPT_PLAIN;
-        else if (startswith(option, "timeout=")) {
-
-                if (parse_usec(option+8, &opt_timeout) < 0) {
-                        log_error("timeout= parse failure, ignoring.");
-                        return 0;
-                }
-
-        } else if (!streq(option, "none"))
-                log_error("Encountered unknown /etc/crypttab option '%s', ignoring.", option);
-
-        return 0;
-}
-
-static int parse_options(const char *options) {
-        char *state;
-        char *w;
-        size_t l;
-
-        assert(options);
-
-        FOREACH_WORD_SEPARATOR(w, l, options, ",", state) {
-                char *o;
-                int r;
-
-                if (!(o = strndup(w, l)))
-                        return -ENOMEM;
-
-                r = parse_one_option(o);
-                free(o);
-
-                if (r < 0)
-                        return r;
-        }
-
-        return 0;
-}
-
-static void log_glue(int level, const char *msg, void *usrptr) {
-        log_debug("%s", msg);
-}
-
-static char *disk_description(const char *path) {
-        struct udev *udev = NULL;
-        struct udev_device *device = NULL;
-        struct stat st;
-        char *description = NULL;
-        const char *model;
-
-        assert(path);
-
-        if (stat(path, &st) < 0)
-                return NULL;
-
-        if (!S_ISBLK(st.st_mode))
-                return NULL;
-
-        if (!(udev = udev_new()))
-                return NULL;
-
-        if (!(device = udev_device_new_from_devnum(udev, 'b', st.st_rdev)))
-                goto finish;
-
-        if ((model = udev_device_get_property_value(device, "ID_MODEL_FROM_DATABASE")) ||
-            (model = udev_device_get_property_value(device, "ID_MODEL")) ||
-            (model = udev_device_get_property_value(device, "DM_NAME")))
-                description = strdup(model);
-
-finish:
-        if (device)
-                udev_device_unref(device);
-
-        if (udev)
-                udev_unref(udev);
-
-        return description;
-}
-
-static char *disk_mount_point(const char *label) {
-        char *mp = NULL, *device = NULL;
-        FILE *f = NULL;
-        struct mntent *m;
-
-        /* Yeah, we don't support native systemd unit files here for now */
-
-        if (asprintf(&device, "/dev/mapper/%s", label) < 0)
-                goto finish;
-
-        f = setmntent("/etc/fstab", "r");
-        if (!f)
-                goto finish;
-
-        while ((m = getmntent(f)))
-                if (path_equal(m->mnt_fsname, device)) {
-                        mp = strdup(m->mnt_dir);
-                        break;
-                }
-
-finish:
-        if (f)
-                endmntent(f);
-
-        free(device);
-
-        return mp;
-}
-
-static int help(void) {
-
-        printf("%s attach VOLUME SOURCEDEVICE [PASSWORD] [OPTIONS]\n"
-               "%s detach VOLUME\n\n"
-               "Attaches or detaches an encrypted block device.\n",
-               program_invocation_short_name,
-               program_invocation_short_name);
-
-        return 0;
-}
-
-int main(int argc, char *argv[]) {
-        int r = EXIT_FAILURE;
-        struct crypt_device *cd = NULL;
-        char **passwords = NULL, *truncated_cipher = NULL;
-        const char *cipher = NULL, *cipher_mode = NULL, *hash = NULL, *name = NULL;
-        char *description = NULL, *name_buffer = NULL, *mount_point = NULL;
-
-        if (argc <= 1) {
-                help();
-                return EXIT_SUCCESS;
-        }
-
-        if (argc < 3) {
-                log_error("This program requires at least two arguments.");
-                return EXIT_FAILURE;
-        }
-
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
-
-        umask(0022);
-
-        if (streq(argv[1], "attach")) {
-                uint32_t flags = 0;
-                int k;
-                unsigned try;
-                const char *key_file = NULL;
-                usec_t until;
-                crypt_status_info status;
-
-                /* Arguments: systemd-cryptsetup attach VOLUME SOURCE-DEVICE [PASSWORD] [OPTIONS] */
-
-                if (argc < 4) {
-                        log_error("attach requires at least two arguments.");
-                        goto finish;
-                }
-
-                if (argc >= 5 &&
-                    argv[4][0] &&
-                    !streq(argv[4], "-") &&
-                    !streq(argv[4], "none")) {
-
-                        if (!path_is_absolute(argv[4]))
-                                log_error("Password file path %s is not absolute. Ignoring.", argv[4]);
-                        else
-                                key_file = argv[4];
-                }
-
-                if (argc >= 6 && argv[5][0] && !streq(argv[5], "-"))
-                        parse_options(argv[5]);
-
-                /* A delicious drop of snake oil */
-                mlockall(MCL_FUTURE);
-
-                description = disk_description(argv[3]);
-                mount_point = disk_mount_point(argv[2]);
-
-                if (description && streq(argv[2], description)) {
-                        /* If the description string is simply the
-                         * volume name, then let's not show this
-                         * twice */
-                        free(description);
-                        description = NULL;
-                }
-
-                if (mount_point && description)
-                        asprintf(&name_buffer, "%s (%s) on %s", description, argv[2], mount_point);
-                else if (mount_point)
-                        asprintf(&name_buffer, "%s on %s", argv[2], mount_point);
-                else if (description)
-                        asprintf(&name_buffer, "%s (%s)", description, argv[2]);
-
-                name = name_buffer ? name_buffer : argv[2];
-
-                if ((k = crypt_init(&cd, argv[3]))) {
-                        log_error("crypt_init() failed: %s", strerror(-k));
-                        goto finish;
-                }
-
-                crypt_set_log_callback(cd, log_glue, NULL);
-
-                status = crypt_status(cd, argv[2]);
-                if (status == CRYPT_ACTIVE || status == CRYPT_BUSY) {
-                        log_info("Volume %s already active.", argv[2]);
-                        r = EXIT_SUCCESS;
-                        goto finish;
-                }
-
-                if (opt_readonly)
-                        flags |= CRYPT_ACTIVATE_READONLY;
-
-                if (opt_discards)
-                        flags |= CRYPT_ACTIVATE_ALLOW_DISCARDS;
-
-                if (opt_timeout > 0)
-                        until = now(CLOCK_MONOTONIC) + opt_timeout;
-                else
-                        until = 0;
-
-                opt_tries = opt_tries > 0 ? opt_tries : 3;
-                opt_key_size = (opt_key_size > 0 ? opt_key_size : 256);
-                if (opt_hash) {
-                        /* plain isn't a real hash type. it just means "use no hash" */
-                        if (!streq(opt_hash, "plain"))
-                                hash = opt_hash;
-                } else
-                        hash = "ripemd160";
-
-                if (opt_cipher) {
-                        size_t l;
-
-                        l = strcspn(opt_cipher, "-");
-
-                        if (!(truncated_cipher = strndup(opt_cipher, l))) {
-                                log_oom();
-                                goto finish;
-                        }
-
-                        cipher = truncated_cipher;
-                        cipher_mode = opt_cipher[l] ? opt_cipher+l+1 : "plain";
-                } else {
-                        cipher = "aes";
-                        cipher_mode = "cbc-essiv:sha256";
-                }
-
-                for (try = 0; try < opt_tries; try++) {
-                        bool pass_volume_key = false;
-
-                        strv_free(passwords);
-                        passwords = NULL;
-
-                        if (!key_file) {
-                                char *text;
-                                char **p;
-
-                                if (asprintf(&text, "Please enter passphrase for disk %s!", name) < 0) {
-                                        log_oom();
-                                        goto finish;
-                                }
-
-                                k = ask_password_auto(text, "drive-harddisk", until, try == 0 && !opt_verify, &passwords);
-                                free(text);
-
-                                if (k < 0) {
-                                        log_error("Failed to query password: %s", strerror(-k));
-                                        goto finish;
-                                }
-
-                                if (opt_verify) {
-                                        char **passwords2 = NULL;
-
-                                        assert(strv_length(passwords) == 1);
-
-                                        if (asprintf(&text, "Please enter passphrase for disk %s! (verification)", name) < 0) {
-                                                log_oom();
-                                                goto finish;
-                                        }
-
-                                        k = ask_password_auto(text, "drive-harddisk", until, false, &passwords2);
-                                        free(text);
-
-                                        if (k < 0) {
-                                                log_error("Failed to query verification password: %s", strerror(-k));
-                                                goto finish;
-                                        }
-
-                                        assert(strv_length(passwords2) == 1);
-
-                                        if (!streq(passwords[0], passwords2[0])) {
-                                                log_warning("Passwords did not match, retrying.");
-                                                strv_free(passwords2);
-                                                continue;
-                                        }
-
-                                        strv_free(passwords2);
-                                }
-
-                                strv_uniq(passwords);
-
-                                STRV_FOREACH(p, passwords) {
-                                        char *c;
-
-                                        if (strlen(*p)+1 >= opt_key_size)
-                                                continue;
-
-                                        /* Pad password if necessary */
-                                        if (!(c = new(char, opt_key_size))) {
-                                                log_oom();
-                                                goto finish;
-                                        }
-
-                                        strncpy(c, *p, opt_key_size);
-                                        free(*p);
-                                        *p = c;
-                                }
-                        }
-
-                        k = 0;
-
-                        if (!opt_type || streq(opt_type, CRYPT_LUKS1))
-                                k = crypt_load(cd, CRYPT_LUKS1, NULL);
-
-                        if ((!opt_type && k < 0) || streq_ptr(opt_type, CRYPT_PLAIN)) {
-                                struct crypt_params_plain params;
-
-                                zero(params);
-                                params.hash = hash;
-
-                                /* for CRYPT_PLAIN limit reads
-                                * from keyfile to key length, and
-                                * ignore keyfile-size */
-                                opt_keyfile_size = opt_key_size / 8;
-
-                                /* In contrast to what the name
-                                 * crypt_setup() might suggest this
-                                 * doesn't actually format anything,
-                                 * it just configures encryption
-                                 * parameters when used for plain
-                                 * mode. */
-                                k = crypt_format(cd, CRYPT_PLAIN,
-                                                 cipher,
-                                                 cipher_mode,
-                                                 NULL,
-                                                 NULL,
-                                                 opt_keyfile_size,
-                                                 &params);
-
-                                /* hash == NULL implies the user passed "plain" */
-                                pass_volume_key = (hash == NULL);
-                        }
-
-                        if (k < 0) {
-                                log_error("Loading of cryptographic parameters failed: %s", strerror(-k));
-                                goto finish;
-                        }
-
-                        log_info("Set cipher %s, mode %s, key size %i bits for device %s.",
-                                 crypt_get_cipher(cd),
-                                 crypt_get_cipher_mode(cd),
-                                 crypt_get_volume_key_size(cd)*8,
-                                 argv[3]);
-
-                        if (key_file)
-                                k = crypt_activate_by_keyfile_offset(cd, argv[2], CRYPT_ANY_SLOT, key_file, opt_keyfile_size,
-                                            opt_keyfile_offset, flags);
-                        else {
-                                char **p;
-
-                                STRV_FOREACH(p, passwords) {
-
-                                        if (pass_volume_key)
-                                                k = crypt_activate_by_volume_key(cd, argv[2], *p, opt_key_size, flags);
-                                        else
-                                                k = crypt_activate_by_passphrase(cd, argv[2], CRYPT_ANY_SLOT, *p, strlen(*p), flags);
-
-                                        if (k >= 0)
-                                                break;
-                                }
-                        }
-
-                        if (k >= 0)
-                                break;
-
-                        if (k != -EPERM) {
-                                log_error("Failed to activate: %s", strerror(-k));
-                                goto finish;
-                        }
-
-                        log_warning("Invalid passphrase.");
-                }
-
-                if (try >= opt_tries) {
-                        log_error("Too many attempts.");
-                        r = EXIT_FAILURE;
-                        goto finish;
-                }
-
-        } else if (streq(argv[1], "detach")) {
-                int k;
-
-                if ((k = crypt_init_by_name(&cd, argv[2]))) {
-                        log_error("crypt_init() failed: %s", strerror(-k));
-                        goto finish;
-                }
-
-                crypt_set_log_callback(cd, log_glue, NULL);
-
-                if ((k = crypt_deactivate(cd, argv[2])) < 0) {
-                        log_error("Failed to deactivate: %s", strerror(-k));
-                        goto finish;
-                }
-
-        } else {
-                log_error("Unknown verb %s.", argv[1]);
-                goto finish;
-        }
-
-        r = EXIT_SUCCESS;
-
-finish:
-
-        if (cd)
-                crypt_free(cd);
-
-        free(opt_cipher);
-        free(opt_hash);
-
-        free(truncated_cipher);
-
-        strv_free(passwords);
-
-        free(description);
-        free(mount_point);
-        free(name_buffer);
-
-        return r;
-}